From 304807b06714dc4c26562c528b7d2aff9c23088a Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Wed, 20 Jan 2021 20:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/groupBuyDetail/groupBuyDetail.js    | 76 ++++++++++++-------
 .../pages/groupBuyList/groupBuyList.wxss      |  2 +-
 .../pages/groupBuyListMy/groupBuyListMy.js    |  4 +-
 .../pages/groupBuyListMy/groupBuyListMy.wxml  |  4 +-
 .../pages/groupBuyListMy/groupBuyListMy.wxss  |  2 +-
 5 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js
index 1084010..a40ba2d 100644
--- a/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js
+++ b/subpages/heart/pages/groupBuyDetail/groupBuyDetail.js
@@ -224,37 +224,55 @@ Page({
     } else if (e.currentTarget.dataset.status == 2) {
       return
     }
-    const para = {
-      groupBuyId: this.data.noticeId,
-      status: status
+    let _this = this
+    let tip = '是否要取消报名?'
+    if (status == 0) {
+      tip = '是否要报名?'
+    } else {
+      tip = '是否要取消报名?'
     }
-    this.setData({
-      lock: true
-    })
-    api.signUpOrCancel(para).then(res => {
-      let title = ''
-      if (status == 0) {
-        title = '报名成功'
-      } else {
-        title = '取消成功'
+    wx.showModal({
+      title: '',
+      content: tip,
+      confirmColor: '#04BCA0',
+      success (res) {
+        if (res.confirm) {
+          const para = {
+            groupBuyId: _this.data.noticeId,
+            status: status
+          }
+          _this.setData({
+            lock: true
+          })
+          api.signUpOrCancel(para).then(res => {
+            let title = ''
+            if (status == 0) {
+              title = '报名成功'
+            } else {
+              title = '取消成功'
+            }
+            _this.setData({
+              dialogVisible: true,
+              dialogTitle: title,
+              evaluateList: [],
+              pageIndex: 1
+            })
+            setTimeout(() => {
+              _this.setData({
+                lock: false
+              })
+            }, 500);
+            _this.getNoticeDetail()
+            _this.getEvaluationList()
+          }).catch(err => {
+            _this.setData({
+              lock: false
+            })
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
       }
-      this.setData({
-        dialogVisible: true,
-        dialogTitle: title,
-        evaluateList: [],
-        pageIndex: 1
-      })
-      setTimeout(() => {
-        this.setData({
-          lock: false
-        })
-      }, 500);
-      this.getNoticeDetail()
-      this.getEvaluationList()
-    }).catch(err => {
-      this.setData({
-        lock: false
-      })
     })
   },
   // 关闭弹框
diff --git a/subpages/heart/pages/groupBuyList/groupBuyList.wxss b/subpages/heart/pages/groupBuyList/groupBuyList.wxss
index 45625bf..4a5c490 100644
--- a/subpages/heart/pages/groupBuyList/groupBuyList.wxss
+++ b/subpages/heart/pages/groupBuyList/groupBuyList.wxss
@@ -90,7 +90,7 @@ page {
   color: #E30000;
 }
 .tag-4 {
-  color: #7561E0;
+  color: #E30000;
 }
 .tag-10 {
   color: #999999;
diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.js b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.js
index b17bbb0..1358609 100644
--- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.js
+++ b/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
diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
index 3788a27..019c10f 100644
--- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxml
+++ b/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>
diff --git a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss
index 0d39923..b433806 100644
--- a/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss
+++ b/subpages/heart/pages/groupBuyListMy/groupBuyListMy.wxss
@@ -136,7 +136,7 @@ page {
     color: #00A066;
   }
   .tag-4 {
-    color: #7561E0;
+    color: #E30000;
   }
   .tag-5 {
     color: #E30000;