拼团购增加截止时间参数；

subpages/heart/pages/groupBuyDetail/groupBuyDetail.js

@@ -224,11 +224,24 @@ Page({
     } else if (e.currentTarget.dataset.status == 2) {
       return
     }
+    let _this = this
+    let tip = '是否要取消报名?'
+    if (status == 0) {
+      tip = '是否要报名?'
+    } else {
+      tip = '是否要取消报名?'
+    }
+    wx.showModal({
+      title: '',
+      content: tip,
+      confirmColor: '#04BCA0',
+      success (res) {
+        if (res.confirm) {
           const para = {
-      groupBuyId: this.data.noticeId,
+            groupBuyId: _this.data.noticeId,
             status: status
           }
-    this.setData({
+          _this.setData({
             lock: true
           })
           api.signUpOrCancel(para).then(res => {
@@ -238,24 +251,29 @@ Page({
             } else {
               title = '取消成功'
             }
-      this.setData({
+            _this.setData({
               dialogVisible: true,
               dialogTitle: title,
               evaluateList: [],
               pageIndex: 1
             })
             setTimeout(() => {
-        this.setData({
+              _this.setData({
                 lock: false
               })
             }, 500);
-      this.getNoticeDetail()
-      this.getEvaluationList()
+            _this.getNoticeDetail()
+            _this.getEvaluationList()
           }).catch(err => {
-      this.setData({
+            _this.setData({
               lock: false
             })
           })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
   },
   // 关闭弹框
   closeDialog () {

subpages/heart/pages/groupBuyList/groupBuyList.wxss

@@ -90,7 +90,7 @@ page {
   color: #E30000;
 }
 .tag-4 {
-  color: #7561E0;
+  color: #E30000;
 }
 .tag-10 {
   color: #999999;

subpages/heart/pages/groupBuyListMy/groupBuyListMy.js

@@ -246,7 +246,7 @@ Page({
   },
   //取消
   toCancel (e) {
-    if (e.currentTarget.dataset.status != 0) {
+    if (e.currentTarget.dataset.status == 5 || e.currentTarget.dataset.status == 10) {
       return
     }
     this.setData({
@@ -279,7 +279,7 @@ Page({
   },
   //结束团购
   toFinish (e) {
-    if (e.currentTarget.dataset.status != 0) {
+    if (e.currentTarget.dataset.status == 5 || e.currentTarget.dataset.status == 10) {
       return
     }
     const id = e.currentTarget.dataset.id

subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml

@@ -39,9 +39,9 @@
               <view class="notice-line"></view>
               <view class="notice-btn {{item.isEdit == 0 ? 'notice-btn-disabled': ''}}" data-id="{{item.id}}" data-edit="{{item.isEdit}}" catchtap="toModify">修改</view>
               <view class="notice-line"></view>
-              <view class="notice-btn {{item.groupBuyStatus != 0 ? 'notice-btn-disabled' : ''}}" data-id="{{item.id}}" data-status="{{item.groupBuyStatus}}" catchtap="toCancel">{{item.groupBuyStatus == 10 ? '已取消' : '取消'}}</view>
+              <view class="notice-btn {{(item.groupBuyStatus == 5 || item.groupBuyStatus == 10) ? 'notice-btn-disabled' : ''}}" data-id="{{item.id}}" data-status="{{item.groupBuyStatus}}" catchtap="toCancel">{{item.groupBuyStatus == 10 ? '已取消' : '取消'}}</view>
               <view class="notice-line"></view>
-              <view class="notice-btn {{item.groupBuyStatus != 0 ? 'notice-btn-disabled' : ''}}" data-id="{{item.id}}" data-status="{{item.groupBuyStatus}}" catchtap="toFinish">{{item.groupBuyStatus == 5 ? '已结束' : '结束'}}</view>
+              <view class="notice-btn {{(item.groupBuyStatus == 5 || item.groupBuyStatus == 10) ? 'notice-btn-disabled' : ''}}" data-id="{{item.id}}" data-status="{{item.groupBuyStatus}}" catchtap="toFinish">{{item.groupBuyStatus == 5 ? '已结束' : '结束'}}</view>
               <view class="notice-line"></view>
               <view class="notice-btn {{item.groupBuyStatus == 10 ? 'notice-btn-disabled' : ''}}" data-id="{{item.id}}" data-status="{{item.groupBuyStatus}}" catchtap="toConfirm">确认交易</view>
             </view>

subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss

@@ -136,7 +136,7 @@ page {
     color: #00A066;
   }
   .tag-4 {
-    color: #7561E0;
+    color: #E30000;
   }
   .tag-5 {
     color: #E30000;