From a627b9b6abf4216778e9508bfe87670c830661aa Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 30 May 2024 14:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=95=E9=83=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E8=B7=9D=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/0-conf.js                 |  8 +++----
 pages/order_detail/order_detail.vue | 34 ++++++++++++-----------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/framework/0-conf.js b/framework/0-conf.js
index 6c036a7..cbe8368 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -16,10 +16,10 @@ const baseUrl = debug ? proxyApi : "https://wxcashiertest.sxczgkj.cn/cashierServ
 const baseUrlwws = 'ws://cashier.sxczgkj.cn/cashierService' 
 // #endif
 // #ifdef APP || MP-WEIXIN
-const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
-const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
-// const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
-// const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
+// const baseUrl = debug ? proxyApi : 'https://cashier.sxczgkj.cn/cashierService'// 线上
+// const baseUrlwws = debug ? proxyApiwws : 'wss://cashier.sxczgkj.cn/cashierService' // 线上
+const baseUrl = 'https://wxcashiertest.sxczgkj.cn/cashierService'// 测试
+const baseUrlwws ='wss://wxcashiertest.sxczgkj.cn/cashierService' // 测试
 // #endif
 
 // import VConsole from "./vConsole.js"
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index 5a37c76..172c0c9 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -255,7 +255,7 @@
 			groupChange(n) {
 				// console.log('groupChange', n);
 				this.radiovalue1 = n
-				uni.cache.set('radiovalue1',n)
+				uni.cache.set('radiovalue1', n)
 			},
 			// fangdouevent() {
 			// 	this.$u.debounce(() => {
@@ -354,7 +354,7 @@
 			},
 			// 去充值
 			goRecharge() {
-				console.log(this.amountVIP.shopId,'调试11111')
+				console.log(this.amountVIP.shopId, '调试11111')
 				uni.pro.navigateTo('/pages/member/index', {
 					shopId: this.amountVIP.shopId
 				})
@@ -408,17 +408,13 @@
 							uni.cache.set('shopUser', '') //删除shopUser
 							this.paymodfiyOrderInfo()
 							setTimeout(res => {
-								// uni.redirectTo({
-								// 	url: '/pages/order/successful?orderId=' + this
-								// 		.listinfoid + '&orderInfo=' + JSON.stringify(
-								// 			this.orderInfo) + '&radiovalue1=' + this
-								// 		.radiovalue1
-								// });
 								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this
-										.listinfo.id
+									url: '/pages/order/successful?orderId=' + this
+										.listinfoid + '&orderInfo=' + JSON.stringify(
+											this.orderInfo) + '&radiovalue1=' + this
+										.radiovalue1
 								});
-							}, 500)
+							}, 1000)
 							// uni.redirectTo({
 							// 	url: "/pages/mall/order/ordersuccess?id=" + datareslane.data
 							// 		.order_id,
@@ -455,17 +451,13 @@
 						title: '支付成功',
 						success: () => {
 							setTimeout(res => {
-								// uni.redirectTo({
-								// 	url: '/pages/order/successful?orderId=' + this
-								// 		.listinfoid + '&orderInfo=' + JSON.stringify(
-								// 			this.orderInfo) + '&radiovalue1=' + this
-								// 		.radiovalue1
-								// });
 								uni.redirectTo({
-									url: '/pages/order/order_detail?orderId=' + this
-										.listinfo.id
+									url: '/pages/order/successful?orderId=' + this
+										.listinfoid + '&orderInfo=' + JSON.stringify(
+											this.orderInfo) + '&radiovalue1=' + this
+										.radiovalue1
 								});
-							}, 500)
+							}, 1000)
 
 
 						}
@@ -726,6 +718,8 @@
 		bottom: 0;
 		left: 0;
 		width: 100%;
+		height: 180rpx;
+		padding: 16rpx 34rpx;
 
 		.flex-between {
 			width: 100%;