From c78b7584b6b0c9af369f3e85c91676179ae62b29 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 28 May 2024 16:38:44 +0800
Subject: [PATCH] 服务卡项点击要避免重复点击的优化。

---
 packageA/pages/details_serviceCard/details_serviceCard.js   | 14 ++++++++------
 packageA/pages/details_serviceCard/details_serviceCard.wxml | 10 ++++++++--
 pages/user/order_list/order_list.js                         | 22 +++++++++++++---------
 pages/user/order_list/order_list.wxml                       | 12 ++++++++++--
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 6875601..34a6c72 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -659,7 +659,9 @@ Page({
 	async pay() {
 
 		if(this.data.is_summit_ing) return false;
-		this.data.is_summit_ing=1;
+		this.setData({
+			is_summit_ing:1
+		})
 
 		var th=this;
 		let order_sn = this.data.details.order_sn;
@@ -688,7 +690,7 @@ Page({
 				let the_c_key=it.pickup_keyid;
 				if (card.storageId.indexOf(the_c_key)==-1) {
 					getApp().confirmBox(it.service_name + "的门店不可售");
-					th.setData({ paying: 0 });
+					th.setData({ is_summit_ing: 0 });
 					flag = false;
 					return false;
 				}
@@ -736,7 +738,7 @@ Page({
 							})
 							if(idx0<0){
 								getApp().confirmBox(it.service_name + "秒杀活动的门店不可售");
-								th.setData({ paying: 0 });
+								th.setData({ is_summit_ing: 0 });
 								flag = false;
 								return false;
 							}
@@ -970,7 +972,7 @@ Page({
 				})
 
 				if(!flag) {
-					th.data.ser_paying=0;
+					th.setData({ is_summit_ing: 0 });
 					return false;
 				}
 
@@ -1041,7 +1043,7 @@ Page({
 				}, 1000)
 
 			}, function (e) {
-				th.data.is_summit_ing = 0;
+				th.setData({ is_summit_ing: 0 });
 				wx.showToast({
 					title: e,
 					icon: 'none',
@@ -1049,7 +1051,7 @@ Page({
 				});
 			})
 		}else{
-			this.data.is_summit_ing=0;
+			th.setData({ is_summit_ing: 0 });
 		}
 
 	},
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index b17d6e3..4d7920b 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -83,12 +83,18 @@
 		<!-- 待支付 -->
 		<block wx:if="{{details.pay_status == 0 && details.order_status==0 && details.prom_type!=6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
-			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">
+				<block wx:if="{{is_summit_ing}}">支付中</block>
+				<block wx:else>立即支付</block>
+			</text>
 		</block>
 
 		<block wx:if="{{details.pt_status == 0 && details.order_status<2 && details.prom_type==6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
-			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
+			<text class="btn bg-red white mgl20" bindtap="pay">
+				<block wx:if="{{is_summit_ing}}">支付中</block>
+				<block wx:else>立即支付</block>
+			</text>
 		</block>
 
 		<block wx:if="{{details.pt_status == 2 && details.order_status<2 && details.prom_type==6 && details.pt_tail_money>0 }}">
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 6761f41..bed7295 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -3142,9 +3142,13 @@ Page({
     let th=this;
 
     if(th.data.ser_paying) return false;
-    th.data.ser_paying=1;
-
+    //th.data.ser_paying=1;
     let index = e.currentTarget.dataset.index;
+
+    //避免重复点击
+    var txt="ser_paying["+index+"]";
+    this.setData({[txt]:1});
+
     let item = this.data.cardList[index];
     let order_sn = item.order_sn;
     let order_id = item.order_id;
@@ -3169,7 +3173,7 @@ Page({
         let the_c_key=it.pickup_keyid;
         if (card.storageId.indexOf(the_c_key)==-1) {
           getApp().confirmBox(it.service_name + "的门店不可售");
-          th.setData({ paying: 0 });
+          th.setData({ ser_paying: 0 });
           flag = false;
           return false;
         }
@@ -3226,7 +3230,7 @@ Page({
               })
               if(idx0<0){
                 getApp().confirmBox(it.service_name + "秒杀活动的门店不可售");
-                th.setData({ paying: 0 });
+                th.setData({ ser_paying: 0 });
                 flag = false;
                 return false;
               }
@@ -3304,7 +3308,7 @@ Page({
 
       };
       //-- 拼团 --
-      if (it.prom_type == 6) {
+      if (it.prom_type == 6 ) {
         let act_details = null;
         let redis_num = 0;
         let promcardbuynum = 0;
@@ -3395,7 +3399,7 @@ Page({
 
       }
       //-- 预售 --
-      if (it.prom_type == 8) {
+      if (it.prom_type == 8 ) {
 
         let act_details = null;
         let promcardbuynum = 0;
@@ -3458,7 +3462,7 @@ Page({
         })
 
         if(!flag) {
-          th.data.ser_paying=0;
+          th.setData({ ser_paying: 0 });
           return false;
         }
 
@@ -3523,7 +3527,7 @@ Page({
 
 
       }, function (e) {
-        th.data.ser_paying=0;
+        th.setData({ ser_paying: 0 });
         wx.showToast({
           title: e,
           icon: 'none',
@@ -3553,7 +3557,7 @@ Page({
       //   // }
       // });
     }else {
-      th.data.ser_paying=0;
+      th.setData({ ser_paying: 0 });
     }
 
   },
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 42b0670..e238a77 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -480,10 +480,18 @@
 				</block>
 
 				<navigator class="commodity_To_evaluate flex-level comment_go"
-						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.order_status==0 && item.pay_status==0 && item.order_status<2}}">立即支付</navigator>
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.order_status==0 && item.pay_status==0 && item.order_status<2}}">
+					<text wx:if="{{ser_paying && ser_paying[index]}}">支付中</text>
+					<text wx:else>立即支付</text>
+
+				</navigator>
 
 				<navigator class="commodity_To_evaluate flex-level comment_go"
-						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">立即支付</navigator>
+						   bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">
+					<text wx:if="{{ser_paying && ser_paying[index]}}">支付中</text>
+					<text wx:else>立即支付</text>
+
+				</navigator>
 
 				<navigator class="commodity_To_evaluate flex-level comment_go" url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id={{item.order_id}}"
 						   data-idx="{{index}}" wx:if="{{item.order_status<2 && item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
--
libgit2 0.21.4