From 4e3e18cdb0d75c098b68353ef8c86cdd7c0f79b2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 21 八月 2025 15:27:34 +0800
Subject: [PATCH] 111

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

diff --git a/small-program/App.vue b/small-program/App.vue
index 22c1eea..9bfe61a 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -6,21 +6,63 @@
 		},
 		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)
-							that.$isResolve()
+							uni.getLocation({
+								type: 'wgs84',
+								success: (addr) => {
+									that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+									that.$isResolve()
+								},
+								fail: (err) => {
+									console.error('鑾峰彇浣嶇疆澶辫触', err);
+									that.$isResolve()
+								}
+							});
+							
 						}
 					}
 				});
+			} else {
+				var that = this
+				let res = this.$u.api.getMemberInfo({}).then(res =>{ 
+					if (res && res.code === 200) { 
+						that.$store.commit('setUserInfo', res.data)
+						uni.getLocation({
+							type: 'wgs84',
+							success: (addr) => {
+								that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+								that.$isResolve()
+							},
+							fail: (err) => {
+								console.error('鑾峰彇浣嶇疆澶辫触', err);
+								that.$isResolve()
+							}
+						});
+					} else {
+						that.$store.commit('setToken','')
+						that.$store.commit('setUserInfo',{})
+						uni.getLocation({
+							type: 'wgs84',
+							success: (addr) => {
+								that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+								that.$isResolve()
+							},
+							fail: (err) => {
+								console.error('鑾峰彇浣嶇疆澶辫触', err);
+								that.$isResolve()
+							}
+						});
+					}
+				})
 			}
 		},
 		onShow: function() {

--
Gitblit v1.9.3