From 194497eed22c39720a58f35144fbbd3cce0e9e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 19 Jul 2024 17:57:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                         | 41 ++++++++++++++++++---------------
 pages/order_food/order_food.vue | 33 ++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/App.vue b/App.vue
index 7995ed9..6f28ee6 100644
--- a/App.vue
+++ b/App.vue
@@ -19,29 +19,32 @@
 			// console.log('App Hide');
 		},
 		methods: {
-			userlogin() {
+			async userlogin() {
 				uni.login({
 					provider: 'weixin',
-					success: (data) => {
-						uni.getUserInfo({
-							provider: 'weixin',
-							success: (infoRes) => {
-								uni.cache.set('weixincode', data.code);
-								let res = this.api.userwxlogin({
-									code: uni.cache.get('weixincode'), //临时登录凭证
-									rawData: infoRes.rawData,
-								})
-								if (res.code == 0) {
-									uni.cache.set('token', res.data.token);
-									uni.cache.set('miniAppOpenId', res.data.userInfo
-										.miniAppOpenId)
-									uni.cache.set('userInfo', res.data.userInfo);
-								}
-							},
-							fail: (err) => {}
-						});
+					success: async (data) => {
+						try {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: async (infoRes) => {
+									uni.cache.set('weixincode', data.code);
+									let res = await this.api.userwxlogin({
+										code: uni.cache.get('weixincode'), //临时登录凭证
+										rawData: infoRes.rawData
+									})
+									if (res.code == 0) {
+										uni.cache.set('token', res.data.token);
+										uni.cache.set('miniAppOpenId', res.data.userInfo
+											.miniAppOpenId)
+										uni.cache.set('userInfo', res.data.userInfo);
+									}
+								},
+								fail: (err) => {}
+							});
+						} catch (e) {}
 					}
 				});
+
 			},
 
 		}
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 2602846..707584f 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -322,8 +322,37 @@
 			this.fixedtrue = true
 		},
 		onShow() {
-			uni.$on('message', this.getMessage)
-			this.productqueryShopIdByTableCode() //获取shop User id
+			if (!uni.cache.get('token')) {
+				uni.login({
+					provider: 'weixin',
+					success: async (data) => {
+						try {
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: async (infoRes) => {
+									uni.cache.set('weixincode', data.code);
+									let res = await this.api.userwxlogin({
+										code: uni.cache.get('weixincode'), //临时登录凭证
+										rawData: infoRes.rawData
+									})
+									if (res.code == 0) {
+										uni.cache.set('token', res.data.token);
+										uni.cache.set('miniAppOpenId', res.data.userInfo
+											.miniAppOpenId)
+										uni.cache.set('userInfo', res.data.userInfo);
+										uni.$on('message', this.getMessage)
+										this.productqueryShopIdByTableCode() //获取shop User id
+									}
+								},
+								fail: (err) => {}
+							});
+						} catch (e) {}
+					}
+				});
+			} else {
+				uni.$on('message', this.getMessage)
+				this.productqueryShopIdByTableCode() //获取shop User id
+			}
 		},
 		methods: {
 			onEnd() { //回调弹幕

From 87f006d66ef003db7e8e27f69f43a91c740d6f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 19 Jul 2024 18:01:46 +0800
Subject: [PATCH 2/2] 11

---
 framework/11-api.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/framework/11-api.js b/framework/11-api.js
index f2a1113..08d6eb4 100644
--- a/framework/11-api.js
+++ b/framework/11-api.js
@@ -103,19 +103,19 @@ async function request(options) {
 		// #endif
 		if (res.code != 0) {
 			if (res.code == -4) {
-				// uni.showToast({
-				// 	title: res.message || res.msg,
-				// 	icon: "none",
-				// 	success: () => {
-				// 		setTimeout(res => {
-				// 			uni.cache.set('token', '');
-				// 			uni.redirectTo({
-				// 				url: '/pages/login/login'
-				// 			});
-				// 		}, 1000)
+				uni.showToast({
+					title: res.message || res.msg,
+					icon: "none"
+					// success: () => {
+					// 	setTimeout(res => {
+					// 		uni.cache.set('token', '');
+					// 		uni.redirectTo({
+					// 			url: '/pages/login/login'
+					// 		});
+					// 	}, 1000)
 
-				// 	}
-				// })
+					// }
+				})
 			} else if (res.code == 482) {
 				let nowTime = new Date() / 1000 | 0
 				let offset = parseInt(res.data.message) - parseInt(nowTime);