From 2800434db8a3117cf4f1ccb119e7ac939f0511bb Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 四月 2026 09:02:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/small-program/App.vue b/small-program/App.vue
index cabc044..4735960 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -61,7 +61,7 @@
 					isHighAccuracy: true,
 					success: function (addr) {
 						const locParam = { latitude: addr.latitude, longitude: addr.longitude };
-						uni.setStorageSync('address', locParam);
+						// uni.setStorageSync('address', locParam);
 						var address = null
 						var myAmapFun = new amapFile.AMapWX({ key: 'e4d46c87adf151dca20060317592b1b6' });
 						myAmapFun.getRegeo({
@@ -74,10 +74,13 @@
 								var ta = info.name || '鍦板潃鑾峰彇澶辫触';
 								locParam.address = ta
 								const resCity = await that.$u.api.getCityByName({ cityName: locParam.city })
-								if (resCity.code === 200) {
+								if (resCity.code === 200 && resCity.data) {
 									locParam.cityId = resCity.data.id
-								}	
-								that.$store.commit('setPosition', locParam)
+									that.$store.commit('setPosition', locParam)
+								} else {
+									that.$store.commit('setPosition', locParam)
+									that.$store.commit('clearCityId')
+								}
 								that.$isResolve()
 							},
 							fail: function(err) {

--
Gitblit v1.9.3