拼团购增加取货方式；我要举报改为我要上访；

pages/toRegister/toRegister.js

@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.6.21"
+    const versionNum = "1.6.22"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag

subpages/heart/components/noticeNew/noticeNew.wxml

@@ -3,8 +3,10 @@
   <view class="notice" wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="toNoticeDetail">
       <view class="notice-title">{{item.departure}} 到 {{item.destination}}</view>
       <view class="notice-bottom">
+        <view class="bottom-left">
+          <view class="notice-tag tag-{{item.status}}">{{item.status == 0 ? '进行中' : '已结束'}}</view>
           <view class="notice-time">出发时间：{{item.departureTime}}</view>
-        <!-- <view class="notice-detail" data-id="{{item.id}}" bindtap="toNoticeDetail">查看{{">"}}</view> -->
+        </view>
       </view>       
   </view>
 </block>

subpages/heart/components/noticeNew/noticeNew.wxss

@@ -23,6 +23,24 @@
   justify-content: space-between;
   height: 80rpx;
 }
+.bottom-left {
+  display: flex;
+  align-items: flex-end;
+  justify-content: flex-start;
+}
+.notice-tag {
+  font-size: 26rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  margin-right: 10rpx;
+  white-space: nowrap;
+}
+.tag-0 {
+  color: #00A066;
+}
+.tag-1 {
+  color: #E30000;
+}
 .notice-time {
   font-size: 26rpx;
   font-family: PingFang SC;

subpages/heart/pages/groupBuyDetail/groupBuyDetail.wxml

@@ -23,6 +23,12 @@
                 </block>                
             </view>
         </view>
+        <view class="apply-item" wx:if="{{details.pickupMethod>0}}">
+            <view class="item-title">取货方式</view>
+            <view class="item-content">
+                {{details.pickupMethod == 1 ? '包邮' : '自提'}}
+            </view>
+        </view>
         <view class="apply-item">
             <view class="item-title">截止时间</view>
             <view class="item-content">

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.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/groupBuyList/groupBuyList.wxss

@@ -74,7 +74,8 @@ page {
 }
 .notice-bottom {
   display: flex;
-  align-items: flex-end;
+  flex-direction: column;
+  align-items: flex-start;
   justify-content: space-between;
   margin-top: 16rpx;
 }

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.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,6 +25,7 @@ Page({
         }
       ],  //groupBuyNumber, groupBuyPrice 团购价格人数（最多五条）
       groupBuyImg: [],          //团购图片（最多三张）
+      pickupMethod: 0,          //取货方式：1-包邮，2-自提
     },
     violationsCount: 0,   //内容审核计数
     isConReview: false,   //内容审核标志
@@ -166,11 +167,18 @@ Page({
       'dataForm.groupBuyEndTime': this.data.dataForm.groupBuyEndTime || getTimestamp()
     })
   },
+  //选择取货方式
+  pickupMethodChange (e) {
+    this.setData({
+      'dataForm.pickupMethod': parseInt(e.detail.value)
+    })
+  },
   //发布
   submitApply () {
     if (this.data.lock) {
       return false
     }
+    console.log(this.data.dataForm.pickupMethod)
     if (!this.data.dataForm.groupBuyTitle) {
       this.showToast("请填标题")
       return false
@@ -179,6 +187,10 @@ Page({
       this.showToast("标题限制在50字以内")
       return false
     }
+    if (!this.data.dataForm.pickupMethod) {
+      this.showToast("请选择取货方式")
+      return false
+    }
     if (!this.data.dataForm.groupBuyEndTime) {
       this.showToast("请填写截止时间")
       return false

subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxml

@@ -36,6 +36,13 @@
             </view>
             
         </view>
+        <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-group>
+        </view>
         <view class="apply-item">
             <view class="item-title">截止时间</view>
             <view class="select-time" bindtap="selectTime">{{dataForm.groupBuyEndTime||'请选择时间'}}</view>

subpages/heart/pages/groupBuyPublish/groupBuyPublish.wxss

@@ -176,3 +176,14 @@ page {
     width: 40rpx;
     height: 40rpx;
 }
+
+.apply-item .radio-group {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    color: #999;
+    font-size: 28rpx;
+  }
+.apply-item .radio-group radio + radio {
+    margin-left: 20rpx;
+}

subpages/oneKeyService/pages/moduleList/moduleList.wxml

@@ -52,7 +52,7 @@
                 button-left="560" 
                 button-width="178" 
                 button-height="178" 
-                img-url="/subpages/oneKeyService/images/reportissue.png"
+                img-url="{{item.imgUrl}}"
                 bindmovebtnCallBack="toReportIssue" 
                 data-code="{{item.categoryCode}}"
                 wx:elif="{{item.categoryType == 'module_category_type_button'}}"></move-btn> 

subpages/oneKeyService/pages/reportIssue/reportIssue.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "我要举报",
+  "navigationBarTitleText": "我要上访",
   "usingComponents": {
     "notice": "../../compontents/notice/notice"
   }

subpages/oneKeyService/pages/reportIssue/reportIssue.wxml

@@ -4,22 +4,22 @@
             <image src="../../images/jubaojilu.png" />
         </view>
         <view class="issue-item text-item">
-            <view class="item-title">举报的问题</view>
+            <view class="item-title">上访内容描述</view>
-            <textarea class="item-content text-content" maxlength="500" placeholder="请详细描述您要举报的问题(500字以内)" value="{{dataForm.content}}" bindinput="onInputContent"></textarea>
+            <textarea class="item-content text-content" maxlength="500" placeholder="请详细描述您要上访的问题(500字以内)" value="{{dataForm.content}}" bindinput="onInputContent"></textarea>
         </view>
         <view class="issue-item">
-            <view class="item-title">举报方式</view>
+            <view class="item-title">是否匿名</view>
             <view class="radio-group">
                 <view class="radio-item" bindtap="onChangeRadio" data-flag="1">
                     <image class="radio-img" src="../../images/radiochecked.png" wx:if="{{dataForm.anonymousFlag == '1'}}"/>
                     <image class="radio-img" src="../../images/radio.png" wx:else/>
-                    <view class="radio-text">匿名举报</view>
+                    <view class="radio-text">是</view>
                 </view>
                 <view class="line"></view>
                 <view class="radio-item" bindtap="onChangeRadio" data-flag="0">
                     <image class="radio-img" src="../../images/radiochecked.png" wx:if="{{dataForm.anonymousFlag == '0'}}"/>
                     <image class="radio-img" src="../../images/radio.png" wx:else/>
-                    <view class="radio-text">实名举报</view>
+                    <view class="radio-text">否</view>
                 </view>
                 <view class="radio-info" hidden="{{dataForm.anonymousFlag == '1'}}">
                     <input type="text" class="info" placeholder="请输入姓名" value="{{dataForm.reportUser}}" bindinput="onInputUser"></input>

subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.json

@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "举报详情",
+  "navigationBarTitleText": "上访详情",
   "usingComponents": {}
 }

subpages/oneKeyService/pages/reportIssueDetail/reportIssueDetail.wxml

@@ -1,27 +1,27 @@
 <view class="report-issue">
     <view class="issue-detail">
         <view class="issue-item">
-            <view class="item-title">举报内容</view>
+            <view class="item-title">上访内容</view>
             <view class="item-content">{{issueDetails.content}}</view>
         </view>
         <view class="issue-item">
-            <view class="item-title">是否匿名举报</view>
+            <view class="item-title">是否匿名</view>
             <view class="item-content">
                 {{issueDetails.anonymousFlag=='1'?'是':'否'}}
             </view>
         </view>
         <block wx:if="{{issueDetails.anonymousFlag=='0'}}">
             <view class="issue-item">
-                <view class="item-title">举报人姓名</view>
+                <view class="item-title">上访人姓名</view>
                 <view class="item-content">{{issueDetails.reportUser}}</view>
             </view>
             <view class="issue-item">
-                <view class="item-title">举报人电话</view>
+                <view class="item-title">上访人电话</view>
                 <view class="item-content">{{issueDetails.reportUserMobile}}</view>
             </view>            
         </block>
         <view class="issue-item">
-            <view class="item-title">举报时间</view>
+            <view class="item-title">上访时间</view>
             <view class="item-content">{{issueDetails.createdTime}}</view>
         </view>
     </view>

subpages/oneKeyService/pages/reportIssueList/reportIssueList.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "举报记录",
+  "navigationBarTitleText": "上访记录",
   "usingComponents": {
     "load-more": "/components/loadMore/loadMore",
     "no-data": "/components/nodata/nodata"