From a223d5e29e9384f720ae98c44cbe10f8fa4f73e7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 21 八月 2025 13:42:16 +0800
Subject: [PATCH] 优化

---
 small-program/App.vue |   90 +++++++++++++++++++++++++++++++-------------
 1 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/small-program/App.vue b/small-program/App.vue
index a3cecd4..a23ecbe 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -4,38 +4,69 @@
 		computed: {
 			...mapState(['userInfo','openid'])
 		},
-		onLaunch: function() {
-				var that = this;
-				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) {
-								that.$store.commit('setToken', res.data.token)
-								that.$store.commit('setOpenid', res.data.openid)
-								that.$store.commit('setUserInfo', res.data.member)
+		onLaunch: function() { 
+			var that = this;
+			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 && res.code === 200) {
+							that.$store.commit('setToken', res.data.token)
+							that.$store.commit('setOpenid', res.data.openid)
+							that.$store.commit('setUserInfo', res.data.member)
+							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() {
 			console.log('App Show')
-			var that =this
-			let res =  this.$u.api.getMemberInfo({}).then(res =>{ 
-				if (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')
@@ -45,4 +76,9 @@
 
 <style lang="scss">
 	@import "uview-ui/index.scss"; 
+	
+	.toast-custom {
+	    width: 500px !important;
+	    font-size: 14px !important;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3