版本1.7.15 首页新增疫情防控；拼团购标签【社区送达】和【包邮到家】

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

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>
 

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'

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">

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>

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>

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,   //内容审核标志

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 == 1}}" value="1" color="#F82525" class="radio">社区送达</radio>
-                <radio checked="{{dataForm.pickupMethod == 2}}" value="2" color="#F82525" class="radio">自提</radio>
+                <radio checked="{{dataForm.pickupMethod == 2}}" value="2" color="#F82525" class="radio">包邮到家</radio>
             </radio-group>
         </view>
         <view class="apply-item">