From e2dd540bb8cc333897f971211f02d5dace6729ef Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 30 Sep 2025 19:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E4=BB=98=E8=B4=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js                  |  2 +-
 pages/order/components/orderInfo.vue |  7 +++++--
 pages/order/confirm-order.vue        | 16 +++++++++++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index 0031c6f..6367448 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -1,5 +1,5 @@
 // const debug = process.env.NODE_ENV == 'development' ? true : false;
-const debug = true
+const debug = false
 // #ifdef H5
 const proxyApi = "/api"
 // #endif
diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue
index 4417cc6..9bf1f3c 100644
--- a/pages/order/components/orderInfo.vue
+++ b/pages/order/components/orderInfo.vue
@@ -479,9 +479,7 @@
 	}
 	watch(() => maxMoney.value, (newval) => {
 		console.log('maxMoney.value', newval);
-		if (usePoints.value) {
 			getMaxPointsDiscount()
-		}
 	})
 	watch(() => usePoints.value, (newval) => {
 		if (newval) {
@@ -548,8 +546,13 @@
 		const consumeDiscountRes = await consumeDiscount({
 			shopId: uni.cache.get('shopId'),
 		})
+		if(!consumeDiscountRes){
+			favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减')
+			return 
+		}
 		if (!consumeDiscountRes.isUse) {
 			favorablelist.value = back_favorablelist.filter(v => v.name != '新客立减')
+			return
 		}
 		if (consumeDiscountRes && consumeDiscountRes.isUse) {
 			newUserDiscount.value = consumeDiscountRes.amount
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 81fe261..052a306 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -783,7 +783,21 @@
 
 		} else {
 			//后付
-
+			
+			// 购物车有数据
+			if (!cartStore.isEmpty) {
+				usePoints=cartStore.orderCostSummary.pointUsed
+				const res = await createOrder()
+				//历史订单数据
+				const res1 = await APIgetOrderById({
+					orderId: res.id
+				})
+				console.log('历史订单数据',res1);
+				orderRemarker.value=res1.remark;
+				cartStore.setOldOrder(res1)
+				goToPay()
+				return 
+			}
 			// 先调用历史订单
 			let APIhistoryOrderres = await APIhistoryOrder({
 				tableCode: listinfo.tableCode