From bbd9c436f23f5fdbe712c4a22d90b457066bdf38 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 17 七月 2025 19:25:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/App.vue |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/small-program/App.vue b/small-program/App.vue
index 22c1eea..1ed19d8 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -6,14 +6,13 @@
 		},
 		onLaunch: function() {
 			var that = this;
-			console.log(this.userInfo)
-			if (!this.userInfo || JSON.stringify(this.userInfo) == '{}') {
+			if (!this.openid || this.openid =='') {
 				uni.login({
 					provider: 'weixin',
 					success: async function (loginRes) {
 						let { code } = loginRes;
 						let res = await that.$u.api.wxLogin({ code })
-						if (res.code === 200) {
+						if (res&& res.code === 200) {
 							that.$store.commit('setToken', res.data.token)
 							that.$store.commit('setOpenid', res.data.openid)
 							that.$store.commit('setUserInfo', res.data.member)
@@ -21,10 +20,22 @@
 						}
 					}
 				});
-			}
+			} 
 		},
 		onShow: function() {
 			console.log('App Show')
+			var that =this
+			let res =  this.$u.api.getMemberInfo({}).then(res =>{ 
+				if (res && res.code ===200) { 
+					that.$store.commit('setUserInfo', res.data)
+					that.$isResolve()
+				}else{
+					that.$store.commit('setToken','')
+					that.$store.commit('setUserInfo',{})
+					that.$isResolve()
+				}
+			})
+			
 		},
 		onHide: function() {
 			console.log('App Hide')

--
Gitblit v1.9.3