From 1780c4ff0abcd2f713eb896ab70315f8cf4caf65 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 5 Jan 2026 11:03:48 +0800
Subject: [PATCH] =?UTF-8?q?Conf(=E5=9C=B0=E5=9B=BE):=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=A4=A9=E5=9C=B0=E5=9B=BE=E5=AE=9A=E4=BD=8D=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=9C=81=E5=B8=82=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/chose-city/chose-city.vue               |   7 +-
 pages/cloud/cloud.vue                         |  59 ++------
 pages/cloud/haveFun.vue                       |  10 +-
 pages/home/index.vue                          |   7 +-
 pages/shop/GoodsCon/index.vue                 |  17 +--
 pages/user/address/AddAddress/index.vue       | 132 ++++--------------
 pkg-video/views/city.vue                      |  12 +-
 pkg-video/views/watch.vue                     |  15 +-
 .../views/gift/components/AddressDialog.vue   | 105 --------------
 utils/common.js                               |  38 ++++-
 utils/mapConfig.js                            |   2 +-
 v4/views/specialty/specialty.vue              |  75 +---------
 12 files changed, 115 insertions(+), 364 deletions(-)

diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 76c2d5f..ce34a9c 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -341,10 +341,11 @@ export default {
     },
     async getMapData() {
       const map = await getLocation()
-      if (map) {
+      if (map.length > 1) {
         const {latitude, longitude} = map[1]
-        const address = await getCurAddress(latitude, longitude)
-        this.location = address[1].data.result.ad_info.city
+        getCurAddress(latitude, longitude, address => {
+          this.location = address.city
+        })
       }
     },
     init() {
diff --git a/pages/cloud/cloud.vue b/pages/cloud/cloud.vue
index 2dc2d0c..5b4b5f9 100644
--- a/pages/cloud/cloud.vue
+++ b/pages/cloud/cloud.vue
@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import config from '@/utils/mapConfig'
+import { getCurAddress, getLocation } from "@/utils/common"
 import {
   getHotelTypeList,
   getHotelList
@@ -124,56 +124,19 @@ export default {
       })
     },
     //获取当前定位地址
-    getCurAddress() {
+    async getCurAddressFn() {
       const that = this
-      //定位
       uni.showLoading({
         title: '定位中...'
       })
-      uni.getLocation({
-        type: 'wgs84',
-        success: function(res) {
-          let latitude = res.latitude
-          let longitude = res.longitude
-          // #ifdef H5
-          Vue.jsonp(
-            'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' +
-            config.key, {
-              output: 'jsonp',
-            }).then(json => {
-            // Success.
-            uni.hideLoading();
-            that.cityName = json.result.ad_info.city
-            that.paramCity = json.result.ad_info.city
-            //定位成功刷新数据
-            that.fetchList()
-          }).catch(err => {
-            uni.hideLoading()
-          })
-          // #endif
-
-          // #ifndef H5
-          uni.request({
-            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
-              '&key=' + config.key,
-            success: function(res) {
-              uni.hideLoading();
-
-              that.cityName = res.data.result.ad_info.city
-              that.paramCity = res.data.result.ad_info.city
-              //定位成功刷新数据
-              that.fetchList()
-            },
-            fail: function(res) {
-              uni.hideLoading()
-            }
-          })
-          // #endif
-        },
-        fail: function(res) {
-          uni.hideLoading()
-        }
-      })
+      const map = await getLocation()
+      if (map.length > 1) {
+        const {latitude, longitude} = map[1]
+        getCurAddress(latitude, longitude, address => {
+          that.cityName = address.city
+          that.paramCity = address.city
+        })
+      }
     },
     fetchTypeList() {
       this.hotelList = []
@@ -195,7 +158,7 @@ export default {
             this.fetchList()
             uni.removeStorageSync('cityName')
           } else {
-            this.getCurAddress()
+            this.getCurAddressFn()
           }
         }
       })
diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 780231d..7c5c49e 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -457,13 +457,11 @@ export default {
     },
     async getMapData() {
       const map = await getLocation()
-      if (map.length > 1) {
+      if (map.length > 1 && !this.cityName) {
         const {latitude, longitude} = map[1]
-        const address = await getCurAddress(latitude, longitude)
-        if(!this.cityName) {
-          this.cityName = address[1].data.result.ad_info.city
-        }
-        // this.search()
+        getCurAddress(latitude, longitude, address => {
+          this.cityName = address.city
+        })
       }
     },
     tapType(index) {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 6f70caf..9323884 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1399,13 +1399,12 @@ export default {
       getLocationPromise().then(mapData => {
         if (mapData.errMsg) {
           const { latitude, longitude } = mapData
-          getCurAddress(latitude, longitude).then(address => {
-            this.cityName = address[1].data.result.ad_info.city
+          getCurAddress(latitude, longitude, address => {
+            console.log(address)
+            this.cityName = address.city
             uni.setStorageSync('locationCityName', this.cityName)
             this.isLocating = false
             this.getPageData()
-          }).catch(() => {
-            this.getPageData()
           })
         } else {
           this.isLocating = false
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index e3d6b4e..a7fbd87 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -901,17 +901,18 @@ export default {
       })
     },
     async getMapData() {
-      let location = uni.getStorageSync('location')
+      const location = uni.getStorageSync('location')
       if (location.length === 0) {
         const map = await getLocation()
         if (map.length > 1) {
           const {latitude, longitude} = map[1]
-          let address = await getCurAddress(latitude, longitude)
-          address = address[1].data.result.ad_info
-          location = address.province + address.city + address.district
+          getCurAddress(latitude, longitude, address => {
+            this.postAddress = address.formattedAddress
+          })
         }
+      } else {
+        this.postAddress = location
       }
-      this.postAddress = location
     },
     // 获取当前位置经纬度
     handleLoacation(toast) {
@@ -923,9 +924,9 @@ export default {
           const map = await getLocation();
           if (map.length > 1) {
             const {latitude, longitude} = map[1]
-            let address = await getCurAddress(latitude, longitude)
-            address = address[1].data.result.ad_info
-            that.postAddress = address.province + address.city + address.district
+            getCurAddress(latitude, longitude, address => {
+              that.postAddress = address.formattedAddress
+            })
           }
         },
         fail: err => {
diff --git a/pages/user/address/AddAddress/index.vue b/pages/user/address/AddAddress/index.vue
index 80a2fc0..2dccfbc 100644
--- a/pages/user/address/AddAddress/index.vue
+++ b/pages/user/address/AddAddress/index.vue
@@ -20,7 +20,7 @@
                 :items="district"
             ></CitySelect>
           </view>
-          <view class="iconfont icon-dizhi font-color-red" @click="getCurAddress()"></view>
+          <view class="iconfont icon-dizhi font-color-red" @click="getCurAddressFn()"></view>
         </view>
       </view>
       <view class="item acea-row row-between-wrapper" style="flex-wrap: nowrap;">
@@ -75,7 +75,7 @@
 
 <script type="text/babel">
 import CitySelect from '@/components/CitySelect'
-import config from '@/utils/mapConfig'
+import {getCurAddress, getLocation} from "@/utils/common"
 import { getAddress, getCity, postAddress, analysisAddress } from '@/api/user'
 import attrs, { chs_extphone, required } from '@/utils/validate'
 import { validatorDefaultCatch } from '@/utils/dialog'
@@ -192,113 +192,33 @@ export default {
       })
     },
     //获取当前定位地址
-    getCurAddress() {
-
-      var that = this;
-      //定位
+    async getCurAddressFn() {
+      const that = this
       uni.showLoading({
         title: '定位中...'
-      });
-
-      //this.getLocation();
-
-      uni.getLocation({
-        type: 'wgs84',
-        success: function (res) {
-          let latitude = res.latitude;
-          let longitude = res.longitude;
-
-          console.log('latitude:' + latitude + 'longitude:' + longitude)
-
-          // #ifdef H5
-          Vue.jsonp(
-              'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' + config.key,
-              {
-                //callbackName: 'QQmap',
-                output: 'jsonp',
-              }).then(json => {
-            // Success.
-            uni.hideLoading();
-
-            that.addressText =
-                json.result.ad_info.province + " " + json.result.ad_info.city + " " + json.result.ad_info.district;
-            that.address.province = json.result.ad_info.province;
-            that.address.city = json.result.ad_info.city;
-            that.address.district = json.result.ad_info.district;
-            that.$set(that.userAddress, 'detail', json.result.formatted_addresses.recommend);
-            //that.userAddress.detail = json.result.formatted_addresses.recommend;
-            // that.$refs.cityselect.adjustDefaultValue();
-
-            //设置city_id
-            var pIdx = that.getIndex(that.address.province, that.district);
-            if (pIdx > -1) {
-              var citys = that.district[pIdx].c;
-              var cIdx = that.getIndex(that.address.city, citys);
-              if (cIdx > -1) {
-                var city = citys[cIdx];
-                that.address.city_id = city.v;
-                console.log('city_id:' + city.v);
-              }
+      })
+      const map = await getLocation()
+      if (map.length > 1) {
+        const {latitude, longitude} = map[1]
+        getCurAddress(latitude, longitude, address => {
+          that.addressText = address.province + " " + address.city + " " + address.county
+          that.address.province = address.province
+          that.address.city = address.city
+          that.address.district = address.county
+          that.$set(that.userAddress, 'detail', address.formattedAddress)
+          // 设置city_id
+          const pIdx = that.getIndex(that.address.province, that.district)
+          if (pIdx > -1) {
+            const citys = that.district[pIdx].c
+            const cIdx = that.getIndex(that.address.city, citys)
+            if (cIdx > -1) {
+              const city = citys[cIdx]
+              that.address.city_id = city.v
+              console.log('city_id:' + city.v)
             }
-
-
-          }).catch(err => {
-            // Failed.
-            console.log('地址解析失败:' + JSON.stringify(err));
-            uni.hideLoading();
-          })
-          // #endif
-
-          // #ifndef H5
-          uni.request({
-            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' + config.key,
-            success: function (res) {
-              // console.log('res:'+JSON.stringify(res.data));
-              uni.hideLoading();
-              that.addressText =
-                  res.data.result.ad_info.province + " " + res.data.result.ad_info.city + " " + res.data.result.ad_info.district;
-              that.address.province = res.data.result.ad_info.province;
-              that.address.city = res.data.result.ad_info.city;
-              that.address.district = res.data.result.ad_info.district;
-              //that.userAddress.detail = res.data.result.formatted_addresses.recommend;
-              that.$set(that.userAddress, 'detail', res.data.result.formatted_addresses.recommend);
-              // that.$refs.cityselect.adjustDefaultValue();
-              //设置city_id
-              var pIdx = that.getIndex(that.address.province, that.district);
-              if (pIdx > -1) {
-                var citys = that.district[pIdx].c;
-                var cIdx = that.getIndex(that.address.city, citys);
-                if (cIdx > -1) {
-                  var city = citys[cIdx];
-                  that.address.city_id = city.v;
-                  console.log('city_id:' + city.v);
-                }
-              }
-
-
-            },
-            fail: function (res) {
-              console.log('地址解析失败');
-              uni.hideLoading();
-            },
-            complete: function () {
-
-            }
-          });
-          // #endif
-        },
-        fail: function (res) {
-          uni.hideLoading();
-
-          // uni.showToast({
-          // 	title:'城市定位失败:'+JSON.stringify(res),
-          // 			icon:'none',
-          // 			duration:2000
-          // })
-        }
-      });
-
-
+          }
+        })
+      }
     },
     getCityList: function () {
       let that = this;
diff --git a/pkg-video/views/city.vue b/pkg-video/views/city.vue
index 3251ad6..e340114 100644
--- a/pkg-video/views/city.vue
+++ b/pkg-video/views/city.vue
@@ -77,11 +77,15 @@ export default {
   },
   methods: {
     async getMapData() {
-      const map = await getLocation();
+      uni.showLoading({
+        title: '定位中...'
+      })
+      const map = await getLocation()
       if (map.length > 1) {
-        const {latitude, longitude} = map[1];
-        const address = await getCurAddress(latitude, longitude);
-        this.cityName = address[1].data.result['ad_info']['city']
+        const {latitude, longitude} = map[1]
+        getCurAddress(latitude, longitude, address => {
+          this.cityName = address.city
+        })
       }
     },
 
diff --git a/pkg-video/views/watch.vue b/pkg-video/views/watch.vue
index 990408b..dba4f17 100644
--- a/pkg-video/views/watch.vue
+++ b/pkg-video/views/watch.vue
@@ -140,14 +140,17 @@ export default {
     },
 
     async getMapData() {
-      const map = await getLocation();
+      uni.showLoading({
+        title: '定位中...'
+      })
+      const map = await getLocation()
       if (map.length > 1) {
-        const {latitude, longitude} = map[1];
-        const address = await getCurAddress(latitude, longitude);
-        this.cityName = address[1].data.result['ad_info']['city']
+        const {latitude, longitude} = map[1]
+        getCurAddress(latitude, longitude, address => {
+          this.cityName = address.city
+          this.fetchList()
+        })
       }
-
-      await this.fetchList()
     },
 
     async fetchList() {
diff --git a/pkg_user/views/gift/components/AddressDialog.vue b/pkg_user/views/gift/components/AddressDialog.vue
index 4f419cf..25087e5 100644
--- a/pkg_user/views/gift/components/AddressDialog.vue
+++ b/pkg_user/views/gift/components/AddressDialog.vue
@@ -234,111 +234,6 @@ export default {
           duration: 2000
         });
       }
-    },
-    //获取当前定位地址
-    getCurAddress() {
-      var that = this;
-      //定位
-      uni.showLoading({
-        title: '定位中...'
-      });
-      //this.getLocation();
-      uni.getLocation({
-      type: 'wgs84',
-      success: function (res) {
-        let latitude = res.latitude;
-        let longitude = res.longitude;
-
-        console.log('latitude:' + latitude + 'longitude:' + longitude)
-
-        // #ifdef H5
-        Vue.jsonp(
-            'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' + config.key,
-            {
-              //callbackName: 'QQmap',
-              output: 'jsonp',
-            }).then(json => {
-          // Success.
-          uni.hideLoading();
-
-          that.addressText =
-              json.result.ad_info.province + " " + json.result.ad_info.city + " " + json.result.ad_info.district;
-          that.address.province = json.result.ad_info.province;
-          that.address.city = json.result.ad_info.city;
-          that.address.district = json.result.ad_info.district;
-          that.$set(that.userAddress, 'detail', json.result.formatted_addresses.recommend);
-          //that.userAddress.detail = json.result.formatted_addresses.recommend;
-          // that.$refs.cityselect.adjustDefaultValue();
-
-          //设置city_id
-          var pIdx = that.getIndex(that.address.province, that.district);
-          if (pIdx > -1) {
-            var citys = that.district[pIdx].c;
-            var cIdx = that.getIndex(that.address.city, citys);
-            if (cIdx > -1) {
-              var city = citys[cIdx];
-              that.address.city_id = city.v;
-              console.log('city_id:' + city.v);
-            }
-          }
-
-
-        }).catch(err => {
-          // Failed.
-          console.log('地址解析失败:' + JSON.stringify(err));
-          uni.hideLoading();
-        })
-        // #endif
-
-        // #ifndef H5
-        uni.request({
-          url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' + config.key,
-          success: function (res) {
-            // console.log('res:'+JSON.stringify(res.data));
-            uni.hideLoading();
-            that.addressText =
-                res.data.result.ad_info.province + " " + res.data.result.ad_info.city + " " + res.data.result.ad_info.district;
-            that.address.province = res.data.result.ad_info.province;
-            that.address.city = res.data.result.ad_info.city;
-            that.address.district = res.data.result.ad_info.district;
-            //that.userAddress.detail = res.data.result.formatted_addresses.recommend;
-            that.$set(that.userAddress, 'detail', res.data.result.formatted_addresses.recommend);
-            // that.$refs.cityselect.adjustDefaultValue();
-            //设置city_id
-            var pIdx = that.getIndex(that.address.province, that.district);
-            if (pIdx > -1) {
-              var citys = that.district[pIdx].c;
-              var cIdx = that.getIndex(that.address.city, citys);
-              if (cIdx > -1) {
-                var city = citys[cIdx];
-                that.address.city_id = city.v;
-                console.log('city_id:' + city.v);
-              }
-            }
-
-
-          },
-          fail: function (res) {
-            console.log('地址解析失败');
-            uni.hideLoading();
-          },
-          complete: function () {
-
-          }
-        });
-        // #endif
-      },
-      fail: function (res) {
-        uni.hideLoading();
-
-        // uni.showToast({
-        // 	title:'城市定位失败:'+JSON.stringify(res),
-        // 			icon:'none',
-        // 			duration:2000
-        // })
-      }
-    });
-
     },
     getCityList: function () {
       let that = this;
diff --git a/utils/common.js b/utils/common.js
index 0d4e21e..1549ff2 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -20,11 +20,39 @@ module.exports = {
         })
     },
 
-    getCurAddress(latitude, longitude) {
-        return uni.request({
-            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
-                '&key=' + config.key
-        });
+    getCurAddress(latitude, longitude, cb) {
+        const postStr = {
+            lon: longitude,
+            lat: latitude,
+            ver: 1 // 接口版本号
+        }
+        const encodedPostStr = encodeURIComponent(JSON.stringify(postStr))
+        
+        uni.request({
+            url: `https://api.tianditu.gov.cn/geocoder?postStr=${encodedPostStr}&type=geocode&tk=${config.key}`,
+            method: 'GET',
+            success: (res) => {
+                if (res.data.status === '0') { // 请求成功[6](@ref)
+                    const result = res.data.result;
+                    // 从返回数据中提取省市区信息[1,6](@ref)
+                    const addressComponent = result.addressComponent;
+                    const province = addressComponent.province; // 省份
+                    const city = addressComponent.city;         // 城市
+                    const county = addressComponent.county;     // 区县
+                    const formattedAddress = result.formatted_address; // 完整地址
+                    cb && cb({
+                        province,
+                        city,
+                        county,
+                        formattedAddress
+                    })
+                }
+                uni.hideLoading()
+            },
+            fail: () => {
+                uni.hideLoading()
+            }
+        })
     },
 
     getLocationSetting(cb) {
diff --git a/utils/mapConfig.js b/utils/mapConfig.js
index 481b887..1fa66f2 100644
--- a/utils/mapConfig.js
+++ b/utils/mapConfig.js
@@ -2,6 +2,6 @@
 module.exports = {
   
   //key: 'LBZBZ-XAJRO-HKYWF-SOACS-HSTYQ-ZUF44'
-  key: 'DGTBZ-3MZCQ-LHY5C-2F6VG-BBY7F-C3FUJ'
+  key: '0328840afc957efec4551c87ade9a38e'
   
 };
diff --git a/v4/views/specialty/specialty.vue b/v4/views/specialty/specialty.vue
index eb3acac..85cc88b 100644
--- a/v4/views/specialty/specialty.vue
+++ b/v4/views/specialty/specialty.vue
@@ -40,8 +40,7 @@
 <script>
 import {
   fetchSpecialty
-} from "@/api/shop";
-import config from '@/utils/mapConfig';
+} from "@/api/shop"
 
 export default {
   data() {
@@ -53,12 +52,12 @@ export default {
     }
   },
   onShow() {
-    let memCityName = uni.getStorageSync("cityName")
+    const memCityName = uni.getStorageSync("cityName")
     if (memCityName.length) {
-      this.cityName = memCityName;
-      this.page = 1;
-      this.list = [];
-      this.fetchList(this.cityName);
+      this.cityName = memCityName
+      this.page = 1
+      this.list = []
+      this.fetchList(this.cityName)
       uni.removeStorageSync("cityName")
     }
   },
@@ -89,67 +88,7 @@ export default {
           })
         }
       })
-    },
-    //获取当前定位地址
-    getCurAddress() {
-      var that = this;
-      //定位
-      uni.showLoading({
-        title: '定位中...'
-      });
-
-      uni.getLocation({
-        type: 'wgs84',
-        success: function (res) {
-          let latitude = res.latitude;
-          let longitude = res.longitude;
-
-          console.log('latitude:' + latitude + 'longitude:' + longitude)
-
-          // #ifdef H5
-          Vue.jsonp(
-              'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude + '&key=' +
-              config.key, {
-                output: 'jsonp',
-              }).then(json => {
-            // Success.
-            uni.hideLoading();
-            that.cityName = json.result.ad_info.city;
-            //定位成功刷新数据
-            that.fetchList()
-          }).catch(err => {
-            // Failed.
-            console.log('地址解析失败:' + JSON.stringify(err));
-            uni.hideLoading();
-          })
-          // #endif
-
-          // #ifndef H5
-          uni.request({
-            url: 'https://apis.map.qq.com/ws/geocoder/v1/?location=' + latitude + ',' + longitude +
-                '&key=' + config.key,
-            success: function (res) {
-              uni.hideLoading();
-
-              that.cityName = res.data.result.ad_info.city;
-
-              //定位成功刷新数据
-              that.fetchList()
-            },
-            fail: function (res) {
-              console.log('地址解析失败');
-              uni.hideLoading();
-            },
-            complete: function () {
-            }
-          });
-          // #endif
-        },
-        fail: function (res) {
-          uni.hideLoading();
-        }
-      });
-    },
+    }
   }
 }
 </script>