From c5292172d9394a41268a683092b35ba5c5352da4 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 13 Aug 2021 13:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.15=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7=EF=BC=9B?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E6=A0=87=E7=AD=BE=E3=80=90=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BA=E9=80=81=E8=BE=BE=E3=80=91=E5=92=8C=E3=80=90=E5=8C=85?=
 =?UTF-8?q?=E9=82=AE=E5=88=B0=E5=AE=B6=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/indexNew/indexNew.js                                | 2 +-
 pages/indexNew/indexNew.wxml                              | 7 ++++---
 pages/toRegister/toRegister.js                            | 2 +-
 subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml   | 2 +-
 subpages/heart/pages/groupBuyList/groupBuyList.wxml       | 2 +-
 subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml   | 2 +-
 subpages/heart/pages/groupBuyPublish/groupBuyPublish.js   | 2 +-
 subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml | 4 ++--
 8 files changed, 12 insertions(+), 11 deletions(-)

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"></move-btn>
 
-<!-- <move-btn wx:if="{{shouye.id}}"
+<move-btn wx:if="{{shouye.id}}"
           area-top="120"
           area-height="90%"
           button-top="1080"
-          button-width="240"
+          button-left="600"
+          button-width="140"
           button-height="140"
           img-url="{{shouye.imgUrl}}"
-          bindmovebtnCallBack="toShouye"></move-btn> -->
+          bindmovebtnCallBack="toShouye"></move-btn>
 
 <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
 
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 @@
         <view class="apply-item" wx:if="{{details.pickupMethod>0}}">
             <view class="item-title">取货方式</view>
             <view class="item-content">
-                {{details.pickupMethod == 1 ? '送达社区' : '自提'}}
+                {{details.pickupMethod == 1 ? '社区送达' : '包邮到家'}}
             </view>
         </view>
         <view class="apply-item">
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 @@
         <image src="{{item.groupBuyImg[0]}}" />
       </view>
       <view class="notice-right">
-        <view class="notice-title">{{item.pickupMethod == 1 ? '【送达社区】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}}</view>
+        <view class="notice-title">{{item.pickupMethod == 1 ? '【社区送达】' : item.pickupMethod == 2 ? '【包邮到家】' : ''}}{{item.groupBuyTitle}}</view>
         <view class="notice-bottom">
           <view class="bottom-left">
             <view class="notice-tag tag-5" wx:if="{{item.topFlag == '1'}}">置顶</view>
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 @@
           <image src="{{item.groupBuyImg[0]}}" />
         </view>
         <view class="notice-right">
-          <view class="notice-title">{{item.pickupMethod == 1 ? '【送达社区】' : item.pickupMethod == 2 ? '【自提】' : ''}}{{item.groupBuyTitle}}</view>
+          <view class="notice-title">{{item.pickupMethod == 1 ? '【社区送达】' : item.pickupMethod == 2 ? '【包邮到家】' : ''}}{{item.groupBuyTitle}}</view>
           <view class="notice-bottom">
             <view class="bottom-left">
               <view class="notice-tag tag-{{item.groupBuyStatus}}">{{item.groupBuyStatus == '0' ? '团购中' : item.groupBuyStatus == '4' ? '已截团' : item.groupBuyStatus == '5' ? '已结束' : '已取消'}}</view>
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 @@
         <view class="apply-item">
             <view class="item-title">取货方式</view>
             <radio-group class="radio-group" bindchange="pickupMethodChange">
-                <radio checked="{{dataForm.pickupMethod == 1}}" value="1" color="#F82525" class="radio">送达社区</radio>
-                <radio checked="{{dataForm.pickupMethod == 2}}" value="2" color="#F82525" class="radio">自提</radio>
+                <radio checked="{{dataForm.pickupMethod == 1}}" value="1" color="#F82525" class="radio">社区送达</radio>
+                <radio checked="{{dataForm.pickupMethod == 2}}" value="2" color="#F82525" class="radio">包邮到家</radio>
             </radio-group>
         </view>
         <view class="apply-item">