From df093ceb70b8f0f6ca2602365372ab13b9bf8804 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 19 Mar 2025 21:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=AE=8C=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/coupon/component/couponPopup.vue        | 42 ++++++++++---------
 .../order/product-waitpay/product-waitpay.vue |  1 +
 pages/order/serviceWaitPay/serviceWaitPay.vue |  1 +
 .../order/singleGoodOrder/singleGoodOrder.vue |  1 +
 .../singleServiceWait/singleServiceWait.vue   |  1 +
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/pages/coupon/component/couponPopup.vue b/pages/coupon/component/couponPopup.vue
index 801cd56..ff4a578 100644
--- a/pages/coupon/component/couponPopup.vue
+++ b/pages/coupon/component/couponPopup.vue
@@ -94,9 +94,9 @@
 
 
 
-	const flushCouponListHandler = () => {
-		getMyCouponList()
-	}
+	// const flushCouponListHandler = () => {
+	// 	getMyCouponList()
+	// }
 
 	const getTotalPriceHandler = (val) => {
 		totalAmount = val
@@ -107,13 +107,13 @@
 
 	onMounted(() => {
 		emitter.on('getTotalPrice', getTotalPriceHandler)
-		emitter.on('flushCouponList', flushCouponListHandler)
+		// emitter.on('flushCouponList', flushCouponListHandler)
 	})
 	
 	onUnmounted(() => {
 		uni.removeStorageSync('couponMap')
 		emitter.off('getTotalPrice', getTotalPriceHandler)
-		emitter.off('flushCouponList', flushCouponListHandler)
+		// emitter.off('flushCouponList', flushCouponListHandler)
 	})
 	
 	
@@ -163,29 +163,31 @@
 	
 	
 	const getMyCouponList = async () => {
-		couponMap = uni.getStorageSync('couponMap')
-		console.log('读缓存======================>', couponMap)
-		if (couponMap) {
-			if (isShow.value) myCouponList.value = couponMap['可用']
-			else myCouponList.value = couponMap['不可用']
-			checkedArr.value = new Array(myCouponList.value.length).fill(false)
-			return 
-		}
+		// couponMap = uni.getStorageSync('couponMap')
+		// console.log('读缓存======================>', couponMap)
+		// if (couponMap) {
+		// 	if (isShow.value) myCouponList.value = couponMap['可用']
+		// 	else myCouponList.value = couponMap['不可用']
+		// 	checkedArr.value = new Array(myCouponList.value.length).fill(false)
+		// 	return 
+		// }
 		const res = await uni.request({
-			url: baseUrl + '/coupon/list/all/own',
+			url: baseUrl + '/coupon/list/use',
 			method: 'POST',
 			header: {
 				cookie
 			},
 			data: {
-				currentAmount: totalAmount
+				currentAmount: totalAmount,
+				isAvailable: isShow.value
 			}
 		})
-		console.log('发请求=====================>', res.data.data)
-		couponMap = res.data.data
-		uni.setStorageSync('couponMap', couponMap)
-		if (isShow.value) myCouponList.value = couponMap['可用']
-		else myCouponList.value = couponMap['不可用']
+		// console.log('发请求=====================>', res.data.data)
+		// couponMap = res.data.data
+		// uni.setStorageSync('couponMap', couponMap)
+		// if (isShow.value) myCouponList.value = couponMap['可用']
+		// else myCouponList.value = couponMap['不可用']
+		myCouponList.value = res.data.data
 		checkedArr.value = new Array(myCouponList.value.length).fill(false)
 	}
 	
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 61d0bfe..93e9077 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -413,6 +413,7 @@ const wxPay = async( oid )=> {  //传入订单id
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
+			emitter.emit('flushCouponListHandler')
 			hideLoading()
 		}, 1000)
 	}
diff --git a/pages/order/serviceWaitPay/serviceWaitPay.vue b/pages/order/serviceWaitPay/serviceWaitPay.vue
index f358187..4ca7593 100644
--- a/pages/order/serviceWaitPay/serviceWaitPay.vue
+++ b/pages/order/serviceWaitPay/serviceWaitPay.vue
@@ -455,6 +455,7 @@
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
+			emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}
diff --git a/pages/order/singleGoodOrder/singleGoodOrder.vue b/pages/order/singleGoodOrder/singleGoodOrder.vue
index 8681772..0eef641 100644
--- a/pages/order/singleGoodOrder/singleGoodOrder.vue
+++ b/pages/order/singleGoodOrder/singleGoodOrder.vue
@@ -310,6 +310,7 @@ const updateAddressHandler = (val) => {
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
+			emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}
diff --git a/pages/order/singleServiceWait/singleServiceWait.vue b/pages/order/singleServiceWait/singleServiceWait.vue
index 86a4dda..df863d7 100644
--- a/pages/order/singleServiceWait/singleServiceWait.vue
+++ b/pages/order/singleServiceWait/singleServiceWait.vue
@@ -452,6 +452,7 @@
 		showLoading()
 		debounceTimer = setTimeout(async () => {
 			await getMyCouponList()
+			// emitter.emit('flushCouponList')
 			hideLoading()
 		}, 1000)
 	}