diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 6fee08a..744b1f5 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -310,7 +310,7 @@ Page({
this.setData({
yjfw: this.data.yjfw
})
- } else if (item.categoryCode == 'shouye') {
+ } else if (item.categoryCode == 'mudule_yqfk') {
this.data.shouye = { ...item }
this.setData({
shouye: this.data.shouye
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 25392a5..12994c4 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -187,14 +187,15 @@
img-url="{{sxjs.imgUrl}}"
bindmovebtnCallBack="toSxjs">
-
+ bindmovebtnCallBack="toShouye">
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 2b14a94..de9dd34 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
// }
// })
let that = this
- const versionNum = "1.7.13"
+ const versionNum = "1.7.15"
api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data)
let state = res.data ? res.data.scanFlag : '1'
diff --git a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml
index 1f5a066..0fdaba4 100644
--- a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml
+++ b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml
@@ -26,7 +26,7 @@
取货方式
- {{details.pickupMethod == 1 ? '送达社区' : '自提'}}
+ {{details.pickupMethod == 1 ? '社区送达' : '包邮到家'}}
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxml b/subpages/heart/pages/groupBuyList/groupBuyList.wxml
index 257a7b0..2de4c3f 100644
--- a/subpages/heart/pages/groupBuyList/groupBuyList.wxml
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxml
@@ -13,7 +13,7 @@
- {{item.pickupMethod == 1 ? '【送达社区】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}}
+ {{item.pickupMethod == 1 ? '【社区送达】' : item.pickupMethod == 2 ? '【包邮到家】' : ''}}{{item.groupBuyTitle}}
置顶
diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
index 21b8236..6e6f8d4 100644
--- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
+++ b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
@@ -18,7 +18,7 @@
- {{item.pickupMethod == 1 ? '【送达社区】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}}
+ {{item.pickupMethod == 1 ? '【社区送达】' : item.pickupMethod == 2 ? '【包邮到家】' : ''}}{{item.groupBuyTitle}}
{{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ? '已截团' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}}
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
index 601edee..9a65f6c 100644
--- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.js
@@ -25,7 +25,7 @@ Page({
}
], //groupBuyNumber, groupBuyPrice 团购价格人数(最多五条)
groupBuyImg: [], //团购图片(最多三张)
- pickupMethod: 0, //取货方式:1-送达社区,2-自提
+ pickupMethod: 0, //取货方式:1-社区送达,2-包邮到家
},
violationsCount: 0, //内容审核计数
isConReview: false, //内容审核标志
diff --git a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
index f980e41..44273c3 100644
--- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
@@ -39,8 +39,8 @@
取货方式
- 送达社区
- 自提
+ 社区送达
+ 包邮到家