From 2bee4595777636271925aa7947166e05b2f0a35f Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 6 Aug 2021 13:26:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E9=82=AE=E6=94=B9=E4=B8=BA=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E7=A4=BE=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index 47d86bd..f20c0df 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.7.11"
+    const versionNum = "1.7.12"
     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 27bf080..3f6bb14 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 370ad79..9784beb 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 2cb1262..3a642a6 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 745c33a..889c444 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 9106483..7cd7750 100644
--- a/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
+++ b/subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml
@@ -39,7 +39,7 @@
         <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 == 1}}" value="1" color="#F82525" class="radio">配送社区</radio>
                 <radio checked="{{dataForm.pickupMethod == 2}}" value="2" color="#F82525" class="radio">自提</radio>
             </radio-group>
         </view>