Merge remote-tracking branch 'origin/master'

rk

2025-09-28 2304d7b140c5c5b4bf3a83f9ced8bff37d20c42e

 small-program/App.vue

@@ -1,11 +1,13 @@
<script>
   import { mapState } from 'vuex'
   var QQMapWX = require('@/utils/qqmap-wx-jssdk.js')
   export default {
      computed: {
         ...mapState(['userInfo','openid'])
      },
      onLaunch: function() { 
      onLaunch: function() {  
         var that = this;
         that.getLocaltionBiz() 
         if (!this.openid || this.openid =='') {
            uni.login({
               provider: 'weixin',
@@ -16,17 +18,6 @@
                     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()
                        }
                     });
                     
                  }
               }
@@ -35,32 +26,10 @@
            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()
                     }
                  });
                  that.$store.commit('setUserInfo', res.data) 
               } 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()
                     }
                  });
                  that.$store.commit('setUserInfo',{}) 
               }
            })
         }
@@ -70,6 +39,52 @@
      },
      onHide: function() {
         console.log('App Hide')
      },
      methods:{
         getLocaltionBiz(){
            var that =this
            uni.getLocation({
               type: 'wgs84',
               success: (addr) => {
                  const locParam = { latitude: addr.latitude, longitude: addr.longitude };
                  uni.setStorageSync('address', locParam);
                  var address =null
                  const qqmapsdk = new QQMapWX({
                      key: '4PXBZ-JLBC7-LCLXG-P2SZX-C4HYE-LDBLQ' //腾讯地图申请的key（后续需要公司提供，个人开发者额度有限）
                   });  
                    // 腾讯地图逆地理编码
                  qqmapsdk.reverseGeocoder({
                     locParam,
                     success: function(res) {
                        console.log(res, '==================获取地址');
                        let info = res.result;
                        locParam.province = info.address_component.province;
                        locParam.city = info.address_component.city;
                        locParam.area = info.address_component.district;
                        locParam.street = info.address_component.street;
                        var ta = info.address  || '地址获取失败' ;
                        if(info.formatted_addresses  && info.formatted_addresses.recommend){
                           ta =info.formatted_addresses.recommend
                        }
                        locParam.address =ta											
                        that.$store.commit('setPosition',locParam)
                        that.$isResolve()
                     },
                     fail: (err) => {
                        console.error('获取位置失败===========', err);
                        that.$store.commit('setPosition',locParam)
                        that.$isResolve()
                     }
                  });
                  // that.$store.commit('setPosition',locParam)
                  that.$isResolve()
               },
               fail: (err) => {
                  console.error('获取位置失败', err);
                  that.$isResolve()
               }
            });
         }
      }
   }
</script>