From ec9f453281bd340ac08421013374c636b0e2b522 Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Fri, 27 Sep 2024 15:11:05 +0800
Subject: [PATCH] =?UTF-8?q?```=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=8E=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=9A=84=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整`custom-waterfalls-flow.vue`、`orderDetail.vue`和`pay.js`模块，以改善用户的支付体验和订单详情页面的展示效果。支付逻辑经重构后，流程更加顺畅，同时修复了订单详情更新不及时的小问题，确保前端展示与后端数据同步。

BREAKING CHANGE: 此修改可能会影响与订单详情和支付流程相关的前端展示逻辑。请确保在更新依赖项目时进行相应的测试。
```
---
 common/pay.js                                 |  1 -
 subPageC/order/orderDetail.vue                |  2 +-
 .../custom-waterfalls-flow.vue                | 26 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/common/pay.js b/common/pay.js
index 5e6496f..9f63d03 100644
--- a/common/pay.js
+++ b/common/pay.js
@@ -37,7 +37,6 @@ function setPay(payInfo, callback) {
 				data: res.msg
 			})
 		}
-		debugger
 		console.log(JSON.parse(res.data.displayContent))
 		const  data = JSON.parse(res.data.displayContent)
 
diff --git a/subPageC/order/orderDetail.vue b/subPageC/order/orderDetail.vue
index 8ae8130..9f89223 100644
--- a/subPageC/order/orderDetail.vue
+++ b/subPageC/order/orderDetail.vue
@@ -68,7 +68,7 @@
             <view class="refond-btn" v-if="item.ticketStatus == 1 && item.refundRules != 1"
               hover-class="refond-btn-hover" @click="toRefund(item)">
               单票退款</view>
-            <view class="cover" v-if="item.ticketStatus != 1 && item.ticketCheckedNums == item.ticketChecksNums">{{
+            <view class="cover" v-if="item.ticketStatus != 1 || item.ticketCheckedNums == item.ticketChecksNums">{{
               item.ticketStatusName }}</view>
           </view>
           <uqrcode v-show="false" @complete="completeQr($event, index)" ref="uqrcode" canvas-id="qrcode"
diff --git a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
index 7ecfa6c..e446456 100644
--- a/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
+++ b/uni_modules/custom-waterfalls-flow/components/custom-waterfalls-flow/custom-waterfalls-flow.vue
@@ -111,7 +111,7 @@
 		methods: {
 			// 预加载图片
 			loadImages(idx = 0) {
-				debugger
+				
 				let count = 0;
 				const newList = this.data.list.filter((item, index) => index >= idx);
 				for (let i = 0; i < newList.length; i++) {
@@ -137,7 +137,7 @@
 			},
 			// 刷新
 			refresh() {
-				debugger
+				
 				if (!this.isLoaded) {
 					this.refreshDatas = this.value;
 					return false;
@@ -163,11 +163,11 @@
 				}, 1)
 			},
 			columnValue(index) {
-				debugger
+				
 				return this.data[`column_${index+1}_values`];
 			},
 			change(newValue) {
-				debugger
+				
 				for (let i = 0; i < this.data.list.length; i++) {
 					const cv = this.data[`column_${this.data.list[i].column}_values`];
 					for (let j = 0; j < cv.length; j++) {
@@ -180,7 +180,7 @@
 				}
 			},
 			getMin(a, s) {
-				debugger
+				
 				let m = a[0][s];
 				let mo = a[0];
 				for (var i = a.length - 1; i >= 0; i--) {
@@ -193,7 +193,7 @@
 			},
 			// 计算每列的高度
 			getMinColumnHeight() {
-				debugger
+				
 				return new Promise(resolve => {
 					const heightArr = [];
 					for (let i = 1; i <= this.data.column; i++) {
@@ -209,7 +209,7 @@
 				})
 			},
 			async initValue(i, from) {
-				debugger
+				
 				this.isLoaded = false;
 				if (i >= this.data.list.length || this.refreshDatas.length) {
 					this.msg++;
@@ -224,7 +224,7 @@
 			},
 			// 图片加载完成
 			imgLoad(item, c) {
-				debugger
+				
 				const i = item.index;
 				item.o = 1;
 				this.$set(this.data[`column_${c}_values`], item.cIndex, JSON.parse(JSON.stringify(item)));
@@ -232,7 +232,7 @@
 			},
 			// 图片加载失败
 			imgError(item, c) {
-				debugger
+				
 				const i = item.index;
 				item.o = 1;
 				item[this.data.imageKey] = null;
@@ -241,7 +241,7 @@
 			},
 			// 渲染结束
 			loaded() {
-				debugger
+				
 				if (this.refreshDatas.length) {
 					this.isLoaded = true;
 					this.refresh();
@@ -260,12 +260,12 @@
 			},
 			// 单项点击事件
 			wapperClick(item) {
-				debugger
+				
 				this.$emit('wapperClick', item);
 			},
 			// 图片点击事件
 			imageClick(item) {
-				debugger
+				
 				this.$emit('imageClick', item);
 			}
 		},
@@ -275,7 +275,7 @@
 				handler(newValue, oldValue) {
 					setTimeout(() => {
 						this.$nextTick(() => {
-							debugger
+							
 							if (this.isRefresh) return false;
 							if (this.isLoaded) {
 								// if (newValue.length <= this.curIndex) return this.refresh();