From 54910d3330ab9633c307a04f0b443ebc9bd01a60 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Fri, 27 Dec 2024 09:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=94=81=E8=A7=86=E9=A2=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 me/detail/detail.nvue | 11 +++++++++--
 me/detail/detail.vue  |  8 ++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 133d615..b56a521 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -1041,6 +1041,7 @@
 			},
 			popupPyaClose() {
 				this.isOrder = true
+				console.log(this.isOrder)
 			},
 			/**
 			 * @param {Object} type 类型 
@@ -1048,9 +1049,13 @@
 			 * 2:购买单集视频
 			 */
 			payVideo(type, num) {
+				console.log(this.isOrder)
 				if(!this.isOrder){
 					return;
 				}
+				uni.showLoading({
+					title: '加载中'
+				})
 				this.isOrder = false
 				if (uni.getStorageSync('token')) {
 					this.submitPay(type, num)
@@ -1091,16 +1096,18 @@
 							if (type == 1) { //金币
 								this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
 							} else if (type == 2) { //支付宝
+								uni.hideLoading()
 								this.closePay() //关闭购买选择弹窗
 								this.payPrice = res.data.orders.payMoney //需要支付的价格
 								this.openPopusPay() //显示充值弹窗
 							}
 							
 						}
+						console.log(this.isOrder)
 						
 						// this.payOrder(res.data.orders.ordersId, res.data.orders.payMoney)
 					} else {
-						
+						this.isOrder = true
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
@@ -1124,7 +1131,6 @@
 						this.closePopusPay()
 						this.closePay()
 						that.showPay = false
-						this.isOrder = true
 						that.showMoney = false
 						that.noBuyVideoIndex = null
 						setTimeout(() => {
@@ -1143,6 +1149,7 @@
 						// this.payPrice = payMoney //需要支付的价格
 						// this.openPopusPay() //显示充值弹窗
 					}
+					this.isOrder = true
 				});
 			},
 			//打开购买弹窗
diff --git a/me/detail/detail.vue b/me/detail/detail.vue
index 02c01ae..3fcff1a 100644
--- a/me/detail/detail.vue
+++ b/me/detail/detail.vue
@@ -188,7 +188,7 @@
 
 		<!-- 购买视频 -->
 		<u-popup :closeable="true" :custom-style="customStyle" :safe-area-inset-bottom="true" close-icon="close"
-			close-icon-size="30" close-icon-color="#333333" :mask-custom-style="maskCustomStyle" v-model="showPay"
+			close-icon-size="30" @close="popupPyaClose" close-icon-color="#333333" :mask-custom-style="maskCustomStyle" v-model="showPay"
 			border-radius="24" mode="bottom">
 			<view class="list" :style="listStyle">
 				<view class="list-title flex align-center">
@@ -1317,6 +1317,10 @@
 			closeMoney(data) {
 				this.showMoney = data
 			},
+			popupPyaClose() {
+				this.isOrder = true
+				console.log(this.isOrder)
+			},
 			//使用金币购买
 			submitPay(type, num) {
 				let data = {
@@ -1344,9 +1348,9 @@
 						}
 
 					} else {
+						this.isOrder = true
 						if ( res.status && res.status == 1) {
 							this.showPay = false //关闭购买选择弹窗
-							this.isOrder = true
 							this.getDataList(this.courseId, this.videoList[this.current].courseDetailsId,
 								true);
 							return;