diff --git a/components/PromotionGood.vue b/components/PromotionGood.vue
index 1cc36e9..b6aa283 100644
--- a/components/PromotionGood.vue
+++ b/components/PromotionGood.vue
@@ -3,7 +3,7 @@
- 精选食品
+ 精选
@@ -19,7 +19,7 @@
{{ item.storeName }}
- 优品特价:{{ item.price }} /市场价:{{item.otPrice}}
+ 活动特价:{{ item.price }} /市场价:{{item.otPrice}}
仅剩:{{ item.stock }}{{ item.unitName }}
diff --git a/config/index.js b/config/index.js
index abdf365..5ce6611 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,4 +1,5 @@
-export const VUE_APP_API_URL = 'https://bxg.api.cyjyyjy.com/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.254:48080/bxgApp'
+// export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
+export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
// export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
+export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0aa07b6..8e5221f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
- "name" : "yshopmall",
- "appid" : "__UNI__C7A519E",
+ "name" : "zsw",
+ "appid" : "__UNI__74F040A",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 1,
@@ -249,7 +249,7 @@
},
"quickapp" : {},
"mp-weixin" : {
- "appid" : "wxcd49c83634afd731",
+ "appid" : "wx144be2afc1798f59",
"setting" : {
"urlCheck" : false
},
diff --git a/pages.json b/pages.json
index cde10ec..c0438f7 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
{
"path": "pages/Loading/index",
"style": {
- "navigationBarTitleText": "优品电商"
+ "navigationBarTitleText": "纽康度生物科技"
}
},
{
@@ -40,7 +40,7 @@
{
"path": "pages/home/index",
"style": {
- "navigationBarTitleText": "优品电商",
+ "navigationBarTitleText": "纽康度生物科技",
"navigationBarTextStyle": "white",
"navigationStyle": "custom"
}
@@ -444,7 +444,7 @@
},
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "优品电商",
+ "navigationBarTitleText": "纽康度生物科技",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"navigationStyle": "default"
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 4b3c790..7eb3737 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -1,7 +1,6 @@
-
diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue
index 067ec2a..e23fe7c 100644
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@@ -43,8 +43,8 @@
let bgcolor = item.color;
// 颜色不存在
if (!bgcolor) {
- that.$set(item, 'bgcolor', '#c40414');
- that.$emit('getbgcolor', '#c40414');
+ that.$set(item, 'bgcolor', '#0e2be6');
+ that.$emit('getbgcolor', '#0e2be6');
} else {
that.$set(item, 'bgcolor', bgcolor);
that.$emit('getbgcolor', bgcolor);
diff --git a/pages/home/index.vue b/pages/home/index.vue
index fe59fe8..fcdabdd 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -54,7 +54,7 @@
:detail="benefit" />
-
+
@@ -82,7 +82,7 @@ import Banner from './components/Banner'
import HotCommodity from './components/HotCommodity'
import FirstNewProduct from './components/FirstNewProduct'
import ProductsRecommended from './components/ProductsRecommended'
-import Live from './components/Live'
+// import Live from './components/Live'
import { getHomeData, getShare, getCanvas } from '@/api/public'
import cookie from '@/utils/store/cookie'
@@ -108,7 +108,7 @@ export default {
HotCommodity,
FirstNewProduct,
ProductsRecommended,
- Live,
+ // Live,
},
props: {},
data: function() {
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 1892b20..793089a 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -72,9 +72,8 @@
配送费用
-
- 19元起送,配送免费,请保持手机畅通~
-
+
+ {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }}
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 95ca4ba..bb48721 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -95,7 +95,7 @@