diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index f20c0df..2b14a94 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.7.12" + const versionNum = "1.7.13" 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 3f6bb14..1f5a066 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 9784beb..257a7b0 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 3a642a6..21b8236 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 889c444..601edee 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 7cd7750..f980e41 100644 --- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml +++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml @@ -39,7 +39,7 @@ 取货方式 - 配送社区 + 送达社区 自提