增加退款方式和叫号更改

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

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"

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 pages = getCurrentPages();
-		// // 获取当前页面实例
+		// 获取当前页面实例
-		// const currentPage = pages[pages.length - 1];
+		const currentPage = pages[pages.length - 1];
-		// // 获取页面参数
+		// 获取页面参数
-		// const options = currentPage.options;
+		const options = currentPage.options;
 
-		// // #ifdef MP-WEIXIN
+		// #ifdef MP-WEIXIN
-		// if (options.q) {
+		if (options.q) {
-		// 	dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
+			dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
-		// 	dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
+			dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
-		// }
+		}
-		// // #endif
+		// #endif
-		// // #ifdef MP-ALIPAY
+		// #ifdef MP-ALIPAY
-		// if (getApp().globalData.shopId) {
+		if (getApp().globalData.shopId) {
-		// 	dataform.shopId = getApp().globalData.shopId
+			dataform.shopId = getApp().globalData.shopId
-		// }
+		}
-		// if (getApp().globalData.queueId) {
+		if (getApp().globalData.queueId) {
-		// 	dataform.queueId = getApp().globalData.queueId
+			dataform.queueId = getApp().globalData.queueId
-		// }
+		}
-		//// #endif
+		// #endif
+		uni.cache.set('shopId', dataform.shopId, 30)
 		await nextTick()
-		uni.cache.set('shopId', 29, 30)
 		getQueueUpTablList();
 	})
 </script>