From 0c58d1b03c72fcc58ebe4c1ce374f31939ba8041 Mon Sep 17 00:00:00 2001
From: wwz <1144797966@qq.com>
Date: Tue, 8 Apr 2025 18:24:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E6=AC=BE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=8F=AB=E5=8F=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js                       |  2 +-
 pages/order/components/orderInfoAfter.vue |  8 +++--
 pages/subscribeto/index.vue               | 41 ++++++++++++-----------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index 2c4a371..04a11fe 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 = false
+const debug = true
 // #ifdef H5
 const proxyApi = "/api"
 // #endif
diff --git a/pages/order/components/orderInfoAfter.vue b/pages/order/components/orderInfoAfter.vue
index d2ee49f..765b46e 100644
--- a/pages/order/components/orderInfoAfter.vue
+++ b/pages/order/components/orderInfoAfter.vue
@@ -174,7 +174,7 @@
 						</view>
 					</view>
 				</block>
-				
+
 				<view class="total-wrap" v-if="listinfo.status == 'unpaid'">
 					<view>总计￥</view>
 					<view class="price"> {{listinfo.totalCost}} </view>
@@ -183,7 +183,7 @@
 					<view>实付￥</view>
 					<view class="price"> {{listinfo.payAmount}} </view>
 				</view>
-				
+
 
 			</view>
 		</view>
@@ -215,6 +215,10 @@
 				<text class="t">就餐人数：</text>
 				<text class="info">{{ listinfo.seatNum || ""}}</text>
 			</view>
+			<view class="row" v-if="listinfo.refundType">
+				<text class="t">退款方式：</text>
+				<text class="info">{{ listinfo.refundType == 'cash'?'手动退款':'原路退回'}}</text>
+			</view>
 		</view>
 		<IntegralInput :visible="calcUsablePointsData.showModal" :minValue="calcUsablePointsData.minIntegral"
 			:maxValue="calcUsablePointsData.maxIntegral" :instructions="calcUsablePointsData.instructionText"
diff --git a/pages/subscribeto/index.vue b/pages/subscribeto/index.vue
index 3210be6..83c4f8c 100644
--- a/pages/subscribeto/index.vue
+++ b/pages/subscribeto/index.vue
@@ -182,6 +182,7 @@
 		if (res.queueInfo) {
 			dataform.queueInfo = res.queueInfo;
 		} else {
+			dataform.queueInfo = null
 			userorderList()
 		}
 		dataform.shopInfo = res.shopInfo;
@@ -270,28 +271,28 @@
 	onMounted(async () => {
 		await proxy.$onLaunched;
 		// 获取当前页面栈
-		// const pages = getCurrentPages();
-		// // 获取当前页面实例
-		// const currentPage = pages[pages.length - 1];
-		// // 获取页面参数
-		// const options = currentPage.options;
+		const pages = getCurrentPages();
+		// 获取当前页面实例
+		const currentPage = pages[pages.length - 1];
+		// 获取页面参数
+		const options = currentPage.options;
 
-		// // #ifdef MP-WEIXIN
-		// if (options.q) {
-		// 	dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
-		// 	dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
-		// }
-		// // #endif
-		// // #ifdef MP-ALIPAY
-		// if (getApp().globalData.shopId) {
-		// 	dataform.shopId = getApp().globalData.shopId
-		// }
-		// if (getApp().globalData.queueId) {
-		// 	dataform.queueId = getApp().globalData.queueId
-		// }
-		//// #endif
+		// #ifdef MP-WEIXIN
+		if (options.q) {
+			dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
+			dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
+		}
+		// #endif
+		// #ifdef MP-ALIPAY
+		if (getApp().globalData.shopId) {
+			dataform.shopId = getApp().globalData.shopId
+		}
+		if (getApp().globalData.queueId) {
+			dataform.queueId = getApp().globalData.queueId
+		}
+		// #endif
+		uni.cache.set('shopId', dataform.shopId, 30)
 		await nextTick()
-		uni.cache.set('shopId', 29, 30)
 		getQueueUpTablList();
 	})
 </script>