From af720a1bab23305a85d337a4b8572aaa96bd6b30 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Mon, 27 May 2024 13:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                    | 2 +-
 pages/index/coupons/index.vue       | 4 +++-
 pages/order_detail/order_detail.vue | 4 ++--
 pages/product/placeOrder.vue        | 7 ++++++-
 pages/user/coupon.vue               | 3 ++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index 90c3576..d891428 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -143,7 +143,7 @@ export default {
 		return uni.api.get("/distirict/comShopList", data);
 	},
 	loginOut(data) { //退出登录
-		return uni.api.post("/login /loginOut", data);
+		return uni.api.post("/login/loginOut", data);
 	},
 	productqueryShopIdByTableCode(data) { //通过桌码获取shopId
 		return uni.api.get("/product/queryShopIdByTableCode", data);
diff --git a/pages/index/coupons/index.vue b/pages/index/coupons/index.vue
index 8abed28..f81b8fa 100644
--- a/pages/index/coupons/index.vue
+++ b/pages/index/coupons/index.vue
@@ -124,6 +124,7 @@
 			};
 		},
 		onLoad(e) {
+			console.log(e,'调试1')
 			try {
 				this.orderfood = e.orderfood //等于0扫码点餐下单
 				this.amount = e.amount
@@ -193,7 +194,8 @@
 					userId: uni.cache.get('userInfo').id,
 					status: 0,
 					page: this.form.page,
-					size: this.form.size
+					size: this.form.size,
+					orderId:''
 				})
 				try {
 					this.totalnumber = res.data.total
diff --git a/pages/order_detail/order_detail.vue b/pages/order_detail/order_detail.vue
index f6cd4e7..c04e5be 100644
--- a/pages/order_detail/order_detail.vue
+++ b/pages/order_detail/order_detail.vue
@@ -316,8 +316,8 @@
 			orderfoodindex() {
 				uni.pro.navigateTo('index/coupons/index', {
 					orderfood: 0,
+					orderId :this.listinfoid,
 					amount: this.listinfo.amounts
-
 				})
 			},
 			copyHandle(e) {
@@ -423,7 +423,7 @@
 				} else {
 					// 判断是否有绑定支付密码
 					// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-					let isVip = uni.cache.get('userInfo').isPwd
+					let isVip =  uni.cache.get('userInfo').isPwd
 					if (isVip == 0) {
 						uni.pro.navigateTo('/pages/user/repairpassword', {
 							shopId_id: uni.cache.get('shopUser')
diff --git a/pages/product/placeOrder.vue b/pages/product/placeOrder.vue
index 188325a..21cb975 100644
--- a/pages/product/placeOrder.vue
+++ b/pages/product/placeOrder.vue
@@ -108,6 +108,8 @@
 		},
 		onLoad(e) {
 			this.getInfo(e.id)
+			
+			
 			this.orderIds = e.id
 			this.amount = uni.cache.get('userInfo').amount
 			this.vipId = uni.cache.get('userInfo').id
@@ -134,6 +136,7 @@
 				})
 				if (res.code == 0) {
 					this.amountVIP = res.data
+					
 				}
 			},
 			// 余额支付
@@ -194,7 +197,8 @@
 						this.payEvent(res.data.id)
 					} else {
 						// 先判断是否设置支付密码。0是没设置。没设置的情况下跳转到设置页面。有的话输入支付密码
-						let isVip = uni.cache.get('userInfo').isPwd
+						let isVip =  uni.cache.get('userInfo').isPwd
+						console.log(isVip,'调试1')
 						if (isVip == 0) {
 							uni.pro.navigateTo('/pages/user/repairpassword', {
 								shopId_id: uni.cache.get('shopUser')
@@ -249,6 +253,7 @@
 				})
 				if (res.code == 0) {
 					this.info = res.data
+					uni.cache.set('shopUser', res.data.shopId);
 					// 获取余额
 					this.getAount()
 				}
diff --git a/pages/user/coupon.vue b/pages/user/coupon.vue
index b1563a9..9c4e07e 100644
--- a/pages/user/coupon.vue
+++ b/pages/user/coupon.vue
@@ -109,7 +109,8 @@
 						userId: uni.cache.get('userInfo').id,
 						status: this.form.statuses,
 						page: this.form.page,
-						size: this.form.size
+						size: this.form.size,
+						orderId:""
 					})
 					if (res.data.pages < this.form.page) {
 						this.form.status = 'nomore'