jufubao-mall 2.0.97 → 2.0.98-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.97",
+  "version": "2.0.98-beta2",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -107,6 +107,7 @@
   import { baseIsEmpty, } from "@/utils/xd.base";
   import CusShops from "@/components/CusShops/CusShops.vue";
   import XdMore from "@/components/XdMore/XdMore.vue";
+  import getCoordinatesMixins from "@/mixins/getCoordinatesMixins";
   let $vm = null;
 
   export default {
@@ -118,7 +119,7 @@
       XdQueryFilter,
       XdMore
     },
-    mixins: [componentsMixins,extsMixins,JfbMallNewShopListMixin],
+    mixins: [componentsMixins, extsMixins, JfbMallNewShopListMixin, getCoordinatesMixins],
     data() {
       return {
         //系统变量
@@ -191,6 +192,10 @@
         hdSelfPath: "",//到店自取
         travelfPath:'',//旅游购票
 
+        //设置当前定位
+        onLoadDone:false,   //onload加载完成
+        curLocaltionDone: false,  //当前定位完成
+        curLocaltioInfo: null, //当前定位信息
       }
     },
     watch: {
@@ -210,6 +215,9 @@
       async showQuery(val){
         if(val === 'Y') this.searchFilterList = await this.getSearchFilterList();
       },
+      watchCurLocaltion(val){
+        if(val === true) this.getList();
+      }
     },
     filters:{
       filterLabels(val){
@@ -229,6 +237,13 @@
         stateCity: state => state.cityLocation.city,
         stateLocation: state => state.cityLocation.location || {}
       }),
+      //当前定位是否完成
+      watchCurLocaltion(){
+        return this.onLoadDone === true
+          && this.curLocaltionDone === true
+          && this.curLocaltioInfo !== null;
+      },
+
       fixTopComp(){
         return {
           top: this.layoutInfo.top + 'rpx'
@@ -324,6 +339,26 @@
       this.isFixed = !this.isPreview
       this.init(this.container);
       $vm= this;
+
+      //进入页面获取定位信息
+      //预览模式
+      if(this.$configProject['isPreview']) {
+        this.curLocaltionDone = true;
+        this.curLocaltioInfo =  {};
+      }
+      //非预览模型
+      else {
+        this.getCoordinates()
+          .then(res=>{
+            this.curLocaltioInfo = res;
+            this.curLocaltionDone = true;
+          })
+          .catch(err=>{
+            this.curLocaltioInfo = this.stateLocation;
+            this.curLocaltionDone = true;
+          })
+      }
+
     },
     methods: {
       /**
@@ -482,9 +517,9 @@
         getSFP('brand_ids',this.searchFilterParams['brand']);
         getSFP('area_codes',this.searchFilterParams['area']);
         if(this.stateCity) getSFP('city_code',this.stateCity.city_code);
-        if(this.stateLocation && (this.stateLocation.longitude && this.stateLocation.latitude)){
-          params['longitude'] = this.stateLocation.longitude;
-          params['latitude'] = this.stateLocation.latitude;
+        if(this.curLocaltioInfo && (this.curLocaltioInfo.longitude && this.curLocaltioInfo.latitude)){
+          params['longitude'] = this.curLocaltioInfo.longitude;
+          params['latitude'] = this.curLocaltioInfo.latitude;
         }
         return params
       },
@@ -663,7 +698,7 @@
               reject(err);
             })
         })
-        
+
       },
 
       handleTabs(type){
@@ -776,7 +811,8 @@
         if(consumeMode && consumeMode.options){
           this.consumeModeOfPanelAndUrl = this.getIntersection(consumeMode.options, this.consumeModeOfPanelAndUrl);
         }
-        this.getList();
+
+        this.onLoadDone = true;
       },
       onJfbReachBottom(options) {
         if(this.loading) return;

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -130,6 +130,7 @@
   import XdNoData from "@/components/XdNoData/XdNoData.vue"
   import CusShops from "@/components/CusShops/CusShops.vue"
   import XdMore from "@/components/XdMore/XdMore.vue";
+  import getCoordinatesMixins from "@/mixins/getCoordinatesMixins";
   let $vm = null;
   export default {
     // #ifdef MP-WEIXIN
@@ -143,9 +144,7 @@
       CusShops,
       XdMore,
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbMallResourceShopListMixin
-    ],
+    mixins: [componentsMixins, extsMixins, JfbMallResourceShopListMixin,getCoordinatesMixins],
     data() {
       return {
         closeMask:true,
@@ -155,7 +154,7 @@
         cityList: [],
         consumeModeList:[],
         brandGroupNum: 8,
-        
+
         showQueryModal: false,
         curQueryTab: "",
         showQueryFilter: false,
@@ -245,6 +244,11 @@
         popId:null,
         footerColor:'#ddd',
         searchFilterList:[],
+
+        //设置当前定位
+        onLoadDone:false,   //onload加载完成
+        curLocaltionDone: false,  //当前定位完成
+        curLocaltioInfo: null, //当前定位信息
       }
     },
     filters:{
@@ -264,6 +268,14 @@
         stateCity: state => state.cityLocation.city,
         stateLocation: state => state.cityLocation.location || {},
       }),
+
+      //当前定位是否完成
+      watchCurLocaltion(){
+        return this.onLoadDone === true
+          && this.curLocaltionDone === true
+          && this.curLocaltioInfo !== null;
+      },
+
       //把brandList每8个分为一组
       groupBrandList(){
         let arr = [];
@@ -321,7 +333,7 @@
         console.log(this.filterMode,this.filterMode==['filter'],this.filterMode.includes('filter'),['filter'].includes('filter'),'ffffffff')
         if(this.filterMode.includes('filter')){
           tabs.push({value: 'filter', label: '筛选', icon: 'iconshaixuanbiaoji_mian',size: 24});
-        } 
+        }
         return tabs
       },
       bodyStyle(){
@@ -360,6 +372,9 @@
           this.onJfbLoad(this.options);
         }
       },
+      watchCurLocaltion(val){
+        if(val === true) this.getList();
+      },
       menuGreater:{
         handler(n,o){
           if(n&&n!==o){
@@ -369,13 +384,13 @@
                 top: this.menuWrapTop/this.$rpxNum+this.bodyPadding.top+'rpx',
                 position: 'absolute',
                 // boxShadow: '0 2px 10px rgba(0,0,0,0.1)',
-                transition: 'transform 0.3s cubic-bezier(0.25, 0.1, 0.25, 1),box-shadow 0.3s ease', 
+                transition: 'transform 0.3s cubic-bezier(0.25, 0.1, 0.25, 1),box-shadow 0.3s ease',
               }
             }else{
               this.menuWrapStyle = {
                 top: this.layoutInfo.top +'rpx',
                 position: 'fixed',
-                transition: 'transform 0.3s cubic-bezier(0.25, 0.1, 0.25, 1),box-shadow 0.3s ease', 
+                transition: 'transform 0.3s cubic-bezier(0.25, 0.1, 0.25, 1),box-shadow 0.3s ease',
               }
             }
           }
@@ -421,10 +436,10 @@
       showQueryModal:{
         handler(n,o){
           if(n){
-            this.setHasPopStatus({popId: this.popId, action: 'add'});  
+            this.setHasPopStatus({popId: this.popId, action: 'add'});
           }else{
             this.setHasPopStatus({popId: this.popId, action: 'del'});
-          } 
+          }
         },
         immediate:true,
         deep:true,
@@ -449,12 +464,25 @@
       this.popId = this.$xdUniHelper.randomChar(20);
       this.init(this.container);
       $vm= this;
-      //todo
-    },
-    mounted(){
-      console.log(this.layoutInfo,'this.layoutInfo')
-      // window.addEventListener('scroll', this.watchScroll);
-      
+
+      //进入页面获取定位信息
+      //预览模式
+      if(this.$configProject['isPreview']) {
+        this.curLocaltionDone = true;
+        this.curLocaltioInfo =  {};
+      }
+      //非预览模型
+      else {
+        this.getCoordinates()
+          .then(res=>{
+            this.curLocaltioInfo = res;
+            this.curLocaltionDone = true;
+          })
+          .catch(err=>{
+            this.curLocaltioInfo = this.stateLocation;
+            this.curLocaltionDone = true;
+          })
+      }
     },
     methods: {
       ...mapActions(['getCustomList','setHasPopStatus']),
@@ -509,13 +537,14 @@
           delete options['shop_category_ids'];
         }
         this.options = this.$xdUniHelper.cloneDeep(options);
-        console.log('event.onJfbLoad', this.stateCity, this.stateLocation)
+
         await Promise.all([
           this.p_getSearchFilter(),
           this.p_getCityList()
         ])
+
         this.$nextTick(() => {
-          this.getList();
+          this.onLoadDone = true;
         })
       },
       /**
@@ -575,16 +604,16 @@
         //描边
         this.cardItemBorder = gCPVal(container, 'cardItemBorder', [{color: '#f8f8f8',width: 2,style: 'solid'}],{isBorder: true});
         // this.cardItemRadius = getContainerPropsValue(container, 'content.cardItemRadius', 16);
-        
+
         this.shopInfoPath = gCPVal(container, 'shopInfoPath', {value: ""}).value;
         this.scanPath = gCPVal(container, 'scanPath', {value: ""}).value;
         this.exchangePath = gCPVal(container, 'exchangePath', {value: ""}).value;
         this.takeGoodsPath = gCPVal(container, 'takeGoodsPath', {value: ""}).value;
         this.buyTicketPath = gCPVal(container, 'buyTicketPath', {value: ""}).value;
         this.codePath = gCPVal(container, 'codePath', {value: ""}).value;
-      
+
         this.isAutoJump = gCPVal(container, 'isAutoJump', []);
-        
+
         //图片 描边
         this.cardImageBorder = gCPVal(container, 'cardImageBorder', [{color: '#f8f8f8',width: '2',style: 'solid'}],{isBorder: true});
         console.log(this.cardImageBorder,'cardImageBorder')
@@ -651,7 +680,7 @@
         //内容区边距
         this.bodyPadding = gCPVal(container,'bodyPadding', [0], {sKey:'bodyPaddingStatus',fields:['bodyPadding'],isPMR: true,});
         console.log(this.bodyPadding,'this.bodyPadding')
-        
+
         this.listPadding = gCPVal(container,'listPadding', [((shopStyle===sValue)?{ bottom:0,left:16, right:16,top:16}:{top:2,left:0,right:0,bottom:0}),20], {sKey:'listPaddingStatus',fields:['listPadding'],cusFields: ['shopStyle','margin',shopStyle],isPMR: true,});
         console.log(this.listPadding,'listPadding')
         // this.cardItemSpace = getContainerPropsValue(container, 'content.cardItemSpace', 20);
@@ -785,7 +814,6 @@
       },
       getList(){
         let data = this.getParams();
-        console.log(data,this.namespace,'dddddd')
         data = {
           ...data,
           page_token: this.page_token,
@@ -829,13 +857,6 @@
           }
           this.page_token = res.next_page_token;
           this.hasNextPage = res.next_page_token !== "";
-          
-          // if(this.page_token == 1){
-          //   uni.pageScrollTo({
-          //     scrollTop: 0,
-          //     duration: 0
-          //   })
-          // }
         }).catch(err=>{
           this.loading = false;
         })
@@ -866,11 +887,11 @@
         getSFP('area_codes',this.searchFilterParams['area']);
         getSFP('namespaces',this.searchFilterParams['business_line']);
         if(this.stateCity) getSFP('city_code',this.stateCity.city_code);
-        if(this.stateLocation && (this.stateLocation.longitude && this.stateLocation.latitude)){
-          params['longitude'] = this.stateLocation.longitude;
-          params['latitude'] = this.stateLocation.latitude;
+        if(this.curLocaltioInfo && (this.curLocaltioInfo.longitude && this.curLocaltioInfo.latitude)){
+          params['longitude'] = this.curLocaltioInfo.longitude;
+          params['latitude'] = this.curLocaltioInfo.latitude;
         }
-        console.log(params,'params' )
+
         return params
       },
       getFilter(cb, options){
@@ -1067,7 +1088,7 @@
           this.consume_mode = consume_mode;
         // }
         this.curQueryTab = '';
-        
+
         this.getList();
       },
       onJfbScroll(options) {
@@ -1288,7 +1309,7 @@
         z-index: 999;
         position: fixed;
         width: 100%;
-        
+
         .menu_list{
           display: flex;
           box-sizing: border-box;
@@ -1342,7 +1363,7 @@
           overflow: hidden;
           text-overflow: ellipsis;
           font-size: 24rpx;
-          
+
           &.active{
             background-color: #DEEDFF;
             border: 1px solid #1989FA;
@@ -1361,7 +1382,7 @@
           margin: 10rpx;
           width: 160rpx;
           &.active{
-            
+
             .brand_name{
               color: var(--main-color);
             }

package/src/components/JfbMallShopList/JfbMallShopList.vue

@@ -169,6 +169,7 @@
   import {
     baseIsEmpty,
   } from "@/utils/xd.base";
+  import getCoordinatesMixins from "@/mixins/getCoordinatesMixins";
 
   export default {
     name: "JfbMallShopList",
@@ -177,7 +178,7 @@
       XdButton,
       XdQueryFilter,
     },
-    mixins: [componentsMixins,extsMixins,JfbMallShopListMixin],
+    mixins: [componentsMixins, extsMixins, JfbMallShopListMixin,getCoordinatesMixins],
     data() {
       return {
 
@@ -237,6 +238,12 @@
         delivery:'',
         scrollTop: 0,
         scrollHeight: 0,
+
+
+        //设置当前定位
+        onLoadDone:false,   //onload加载完成
+        curLocaltionDone: false,  //当前定位完成
+        curLocaltioInfo: null, //当前定位信息
       }
     },
     watch: {
@@ -254,6 +261,10 @@
         }
       },
 
+      watchCurLocaltion(val){
+        if(val === true) this.getList();
+      }
+
     },
     computed: {
       ...mapState({
@@ -263,6 +274,13 @@
       }),
       ...styleForm.getComputedItem(),
 
+      //当前定位是否完成
+      watchCurLocaltion(){
+        return this.onLoadDone === true
+          && this.curLocaltionDone === true
+          && this.curLocaltioInfo !== null;
+      },
+
       outPadding(){
         let str = `${this.checkValue(this.padding.top, 0)}rpx`;
         str = `${str} ${this.checkValue(this.padding.right, 0)}rpx`;
@@ -300,11 +318,31 @@
     created() {
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
+
+      //进入页面获取定位信息
+      //预览模式
+      if(this.$configProject['isPreview']) {
+        this.curLocaltionDone = true;
+        this.curLocaltioInfo =  {};
+      }
+      //非预览模型
+      else {
+        this.getCoordinates()
+          .then(res=>{
+            this.curLocaltioInfo = res;
+            this.curLocaltionDone = true;
+          })
+          .catch(err=>{
+            this.curLocaltioInfo = this.stateLocation;
+            this.curLocaltionDone = true;
+          })
+      }
     },
     methods: {
       handleError(item){
         item.errorStatus = true;
       },
+
       toNavigationApp(item){
         if(item.latitude && item.longitude) {
           let address = ``
@@ -330,7 +368,6 @@
       },
 
       onJfbLoad(options) {
-        console.log(options,'ppppp');
         //设置业务请求代码
         this.setNameSpace(options);
         if(!baseIsEmpty(options)){
@@ -338,11 +375,9 @@
         }
         this.region_limit_tpl_id = options.region_limit_tpl_id || "";
         this.brand_id = options.brand_id || options.id;
-        // this.brand_ids = options.brand_id;
-        setTimeout(()=>{
-          this.getList();
-				},100)
         this.getSearchFilterList();
+
+        this.onLoadDone = true;
       },
       /**
        * @description 监听事件变化
@@ -448,25 +483,31 @@
         })
       },
       getList(){
-        console.log(this.brand_id,'brand_id')
+
         this.loading = true;
         this.$xdShowLoading({});
+
+        let params = {
+          consume_mode: this.consume_mode,
+          brand_type: this.brand_type,
+          ...this.options,
+          brand_id: this.brand_id,
+          city_code: this.stateCity.city_code,
+          keyword: this.keyword,
+          page_size: this.page_size,
+          page_token: this.page_token,
+          region_limit_tpl_id: this.region_limit_tpl_id,
+          namespace: this.xnamespace,
+        }
+
+        if(this.curLocaltioInfo && this.curLocaltioInfo.latitude && this.curLocaltioInfo.longitude) {
+          params['latitude']  = this.curLocaltioInfo.latitude;
+          params['longitude'] = this.curLocaltioInfo.longitude;
+        }
+
         jfbRootExec("getShopList", {
           vm: this,
-          data: {
-            consume_mode: this.consume_mode,
-            brand_type: this.brand_type,
-            ...this.options,
-            brand_id: this.brand_id,
-            city_code: this.stateCity.city_code,
-            latitude: this.stateLocation.latitude,
-            longitude: this.stateLocation.longitude,
-            keyword: this.keyword,
-            page_size: this.page_size,
-            page_token: this.page_token,
-            region_limit_tpl_id: this.region_limit_tpl_id,
-            namespace: this.xnamespace,
-          }
+          data: params
         }).then(res => {
           this.loaded = true;
           this.loading = false;
@@ -478,7 +519,7 @@
               errorStatus: false,
             }
           });
-          if(this.page_token == 1){
+          if(Number(this.page_token) === 1){
             this.shopList = list;
           }else{
             this.shopList = this.shopList.concat(list);

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -673,7 +673,7 @@
 
       getParams(){
         let latitude = '', longitude = '';
-        console.log('handleRegionChange',this.stateLocation, this.changeLocation);
+
         if(this.stateLocation && !this.$xdUniHelper.isEmpty(this.stateLocation)) {
           if(this.stateLocation.longitude) longitude = this.stateLocation.longitude + '';
           if(this.stateLocation.latitude) latitude = this.stateLocation.latitude + '';

package/src/mixins/getCoordinatesMixins.js

@@ -0,0 +1,442 @@
+'use strict';
+//#ifdef H5
+import {mapActions} from "vuex";
+//#endif
+import {isWechat} from "@/utils/xd.base";
+import storage from "@/common/storage";
+
+export default  {
+  data(){
+    return {
+      lastSuccessCoords:null,
+
+      //#ifdef H5
+      jwxCoordinatesSDK:null,
+      //#endif
+
+      // #ifdef MP-WEIXIN
+      mpLocationFnCoords:'getFuzzyLocation',
+      // #endif
+
+      //保存上一次定位信息（正式缓冲6分钟，测试机环境0.5小时）
+      locationStorageKeyCoords: "xd_three_map",
+      //永久保存上一次定位信息
+      locationLongStorageKeyCoords: 'xd_three_map_long',
+    }
+  },
+  created() {
+    // #ifdef MP-WEIXIN
+    //判断小程序是否使用精准定位
+    if(this.$configProject['privacy_interface_list']) {
+      this.$configProject['privacy_interface_list'].map(item=>{
+        if(item['api_name'] === 'wx.getLocation') {
+          this.mpLocationFnCoords = 'getLocation';
+        }
+      })
+    }
+    // #endif
+  },
+  methods:{
+    /**
+     * @description 获取位置信息
+     * @return {Promise<unknown>}
+     */
+    getCoordinates() {
+      return new Promise((resolve, reject) => {
+        //#ifdef H5
+        if (isWechat()) {
+          this.getH5WXLocation().then(res => {
+            res = {...res, pf: 'H5-WX'}
+            resolve(res);
+          }).catch(err => {
+            //微信定位失败，降级到百度定位/原生定位
+            this.getH5FallbackLocation(err, resolve, reject);
+          });
+          return;
+        }
+
+        //百度定位
+        if(this.$settings.baiduAk) {
+          this.getBaiduLocation().then(res => {
+            res = {...res, pf: 'H5-BD'}
+            resolve(res);
+          }).catch(err => {
+            reject(err);
+          });
+          return;
+        }
+
+        //H5原生定位兜底
+        if(window.navigator.geolocation) {
+          this.getH5NativeLocation().then(res => {
+            res = {...res, pf: 'H5-PC'}
+            resolve(res);
+          }).catch(err => {
+            reject(err);
+          });
+          return;
+        }
+        //所有定位方式均不可用，直接拒绝避免 Promise 悬挂
+        reject('当前环境不支持定位');
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        this.getWxLocation().then(res => {
+          res = {...res, pf: 'MP-WX'}
+          resolve(res);
+        }).catch(err => {
+          reject(err);
+        });
+        // #endif
+      });
+
+    },
+
+    /**
+     * @description 火星转百度坐标
+     * @param lng
+     * @param lat
+     * @returns {{latitude: *, longitude: *}}
+     */
+    gcj02ToBaiduLatAndLng(lng, lat) {
+      const X_PI = 3.14159265358979324 * 3000.0 / 180.0;
+      const PI = 3.1415926535897932384626;
+      const A = 6378245.0;
+      const EE = 0.00669342162296594323;
+
+      lat = +lat;
+      lng = +lng;
+      let z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * X_PI);
+      let theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * X_PI);
+      let bd_lng = z * Math.cos(theta) + 0.0065;
+      let bd_lat = z * Math.sin(theta) + 0.006;
+      return {longitude: bd_lng, latitude:bd_lat}
+    },
+
+    /**
+     * @description 通用定位执行器：超时 + 防重复 + 成功缓存 + 失败兜底
+     * @param locateFn {Function} 发起定位的函数，接收 {type, success, fail, cancel}
+     * @param resolve {Function}
+     * @param reject {Function}
+     * @param isTargetCoords {Boolean} 是否已是目标坐标系(BD-09)，true则跳过 gcj02→bd09 转换
+     */
+    locateWithFallback(locateFn, resolve, reject, isTargetCoords = false){
+      let done = false;
+      let timer = null;
+
+      //统一收尾：成功保存坐标，失败/超时兜底返回上次成功坐标
+      const finish = (isSuccess, val) => {
+        if (done) return;
+        done = true;
+        clearTimeout(timer);
+        if (isSuccess) {
+          this.lastSuccessCoords = val;
+          resolve(val);
+        } else if (this.lastSuccessCoords) {
+          resolve(this.lastSuccessCoords);
+        } else {
+          //首次定位失败：从本地存储的历史定位兜底
+          const cached = this.getCachedCoords();
+          if (cached) {
+            this.lastSuccessCoords = cached;
+            resolve(cached);
+          } else {
+            reject(val);
+          }
+        }
+      };
+
+      //5秒超时设置
+      timer = setTimeout(() => {
+        finish(false, '定位超时');
+      }, 5000);
+
+      //发起定位
+      locateFn({
+        type: 'gcj02',
+        success: (res) => {
+          const lng = Number(res.longitude);
+          const lat = Number(res.latitude);
+          //坐标有效性校验，避免 NaN 进入缓存
+          if (!Number.isFinite(lng) || !Number.isFinite(lat)) {
+            finish(false, '定位坐标无效');
+            return;
+          }
+          const coords = isTargetCoords
+            ? {longitude: lng, latitude: lat}
+            : this.gcj02ToBaiduLatAndLng(lng, lat);
+          coords.accuracy = res.accuracy !== undefined ? res.accuracy : null;
+          finish(true, coords);
+        },
+        fail: () => finish(false, '定位失败'),
+        cancel: () => finish(false, '定位取消')
+      });
+    },
+
+    /**
+     * @description 从本地存储读取历史定位坐标（BD-09）兜底
+     * @returns {{longitude:number, latitude:number, accuracy:null, fromCache:boolean}|null}
+     */
+    getCachedCoords(){
+      try {
+        //与 newLocaltionMixins.getLocationData() 一致：2小时定位缓存优先，永久缓存兜底
+        const cached = storage.get(this.locationStorageKeyCoords)
+          || storage.get(this.locationLongStorageKeyCoords);
+        const lng = Number(cached && cached.longitude);
+        const lat = Number(cached && cached.latitude);
+        if (Number.isFinite(lng) && Number.isFinite(lat)) {
+          return {longitude: lng, latitude: lat, accuracy: null, fromCache: true};
+        }
+      } catch (e) {}
+      return null;
+    },
+
+
+    //#ifdef H5
+    ...mapActions(['getH5WxAuthorize']),
+
+    /**
+     * @description 初始化微信定位信息
+     * @return {Promise<unknown>}
+     */
+    initH5WXLocation(){
+      return new Promise((resolve, reject) => {
+        //已经初始化
+        if(this.jwxCoordinatesSDK !== null){
+          resolve(this.jwxCoordinatesSDK );
+          return
+        }
+        //未初始化，10s授权超时兜底，避免 Promise 悬挂
+        let authorizeTimer = setTimeout(() => {
+          reject('微信授权超时');
+        }, 10000);
+        this.getH5WxAuthorize({jsApiList: ['openLocation', 'getLocation']})
+          .then(({jwxSDK}) => {
+            clearTimeout(authorizeTimer);
+            this.jwxCoordinatesSDK = jwxSDK;
+            resolve(jwxSDK)
+          })
+          .catch(res => {
+            clearTimeout(authorizeTimer);
+            reject('微信授权失败')
+          });
+      });
+    },
+
+    /**
+     * @description 微信环境获取位置
+     */
+    getH5WXLocation(){
+      return new Promise((resolve, reject) => {
+        this.initH5WXLocation()
+          .then(jwxSDK => {
+            this.locateWithFallback((opts) => jwxSDK.getLocation(opts), resolve, reject);
+          })
+          .catch(err => reject(err));
+      });
+    },
+
+    /**
+     * @description 微信H5定位失败后的降级定位（百度 → 原生）
+     * @param originErr 原始错误信息
+     * @param resolve {Function}
+     * @param reject {Function}
+     */
+    getH5FallbackLocation(originErr, resolve, reject){
+      if(this.$settings.baiduAk) {
+        this.getBaiduLocation()
+          .then(resolve)
+          .catch(() => {
+            if(window.navigator.geolocation) {
+              this.getH5NativeLocation().then(resolve).catch(() => reject(originErr || '定位失败'));
+            } else {
+              reject(originErr || '定位失败');
+            }
+          });
+      } else if(window.navigator.geolocation) {
+        this.getH5NativeLocation().then(resolve).catch(() => reject(originErr || '定位失败'));
+      } else {
+        reject(originErr || '定位失败');
+      }
+    },
+
+    /**
+     * @description 加载百度地图JS SDK（v3.0 经典版）
+     * @description 已加载直接复用；加载中复用缓存 Promise，避免重复创建 script 下载 SDK
+     * @returns {Promise<BMap>}
+     */
+    loadBaiduMapSDK(){
+      //已加载完成，直接复用
+      if (window.BMap && !window.BMap._preloader) {
+        return Promise.resolve(window.BMap);
+      }
+      //加载中，复用同一个 Promise
+      if (window.BMap && window.BMap._preloader) {
+        return window.BMap._preloader;
+      }
+      const ak = this.$settings.baiduAk;
+      if (!ak) {
+        return Promise.reject('百度AK未配置');
+      }
+      //未加载：创建加载流程，缓存 Promise 供并发调用复用
+      window.BMap = window.BMap || {};
+      window.BMap._preloader = new Promise((resolve, reject) => {
+        //10s加载超时兜底，避免回调不触发导致 Promise 悬挂
+        let sdkTimer = setTimeout(() => {
+          delete window._initBaiduMap;
+          window.BMap._preloader = null;
+          window.BMap = null;
+          reject('百度地图SDK加载超时');
+        }, 10000);
+
+        //百度地图SDK加载回调
+        window._initBaiduMap = () => {
+          clearTimeout(sdkTimer);
+          window.BMap._preloader = null;
+          delete window._initBaiduMap;
+          resolve(window.BMap);
+        };
+
+        //创建script标签加载百度地图SDK
+        const script = document.createElement('script');
+        script.src = `https://api.map.baidu.com/api?v=3.0&ak=${ak}&callback=_initBaiduMap`;
+        script.onerror = () => {
+          clearTimeout(sdkTimer);
+          window.BMap._preloader = null;
+          window.BMap = null;
+          delete window._initBaiduMap;
+          reject('百度地图SDK加载失败');
+        };
+        document.head.appendChild(script);
+      });
+      return window.BMap._preloader;
+    },
+
+    /**
+     * @description 百度定位（BMap.Geolocation，返回 BD-09 坐标）
+     */
+    getBaiduLocation(){
+      return new Promise((resolve, reject) => {
+        this.loadBaiduMapSDK()
+          .then(BMap => {
+            //百度返回 bd09，isTargetCoords=true 跳过 gcj02→bd09 转换
+            this.locateWithFallback((opts) => {
+              const geolocation = new BMap.Geolocation();
+              geolocation.getCurrentPosition(
+                (location) => opts.success({
+                  longitude: location.point.lng,
+                  latitude: location.point.lat,
+                  accuracy: location.accuracy
+                }),
+                (err) => opts.fail && opts.fail(err)
+              );
+            }, resolve, reject, true);
+          })
+          .catch(err => reject(err));
+      });
+    },
+
+    /**
+     * @description 获取H5原生位置（navigator.geolocation，WGS-84 → GCJ-02 → BD-09）
+     */
+    getH5NativeLocation(){
+      return new Promise((resolve, reject) => {
+        this.locateWithFallback((opts) => {
+          window.navigator.geolocation.getCurrentPosition(
+            (pos) => {
+              //WGS-84 转 GCJ-02，交由执行器再转 BD-09
+              const gcj02 = this.wgs84ToGcj02LatAndLng(pos.coords.longitude, pos.coords.latitude);
+              gcj02.accuracy = pos.coords.accuracy !== undefined ? pos.coords.accuracy : null;
+              opts.success(gcj02);
+            },
+            (err) => opts.fail && opts.fail(err),
+            { enableHighAccuracy: true, timeout: 10000, maximumAge: 0 }
+          );
+        }, resolve, reject);
+      });
+    },
+
+    /**
+     * @description WGS-84 转 GCJ-02（火星坐标）
+     * @param lng {Number} 经度
+     * @param lat {Number} 纬度
+     * @returns {{longitude: *, latitude: *}}
+     */
+    wgs84ToGcj02LatAndLng(lng, lat) {
+      const PI = 3.1415926535897932384626;
+      const a = 6378245.0;
+      const ee = 0.00669342162296594323;
+
+      //中国境外无需偏移，直接返回
+      if (lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271) {
+        return {longitude: lng, latitude: lat};
+      }
+
+      const transformLat = (x, y) => {
+        let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(y * PI) + 40.0 * Math.sin(y / 3.0 * PI)) * 2.0 / 3.0;
+        ret += (160.0 * Math.sin(y / 12.0 * PI) + 320.0 * Math.sin(y * PI / 30.0)) * 2.0 / 3.0;
+        return ret;
+      };
+
+      const transformLng = (x, y) => {
+        let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+        ret += (20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0 / 3.0;
+        ret += (20.0 * Math.sin(x * PI) + 40.0 * Math.sin(x / 3.0 * PI)) * 2.0 / 3.0;
+        ret += (150.0 * Math.sin(x / 12.0 * PI) + 300.0 * Math.sin(x / 30.0 * PI)) * 2.0 / 3.0;
+        return ret;
+      };
+
+      let dLat = transformLat(lng - 105.0, lat - 35.0);
+      let dLng = transformLng(lng - 105.0, lat - 35.0);
+      const radLat = lat / 180.0 * PI;
+      let magic = Math.sin(radLat);
+      magic = 1 - ee * magic * magic;
+      const sqrtMagic = Math.sqrt(magic);
+      dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * PI);
+      dLng = (dLng * 180.0) / (a / sqrtMagic * Math.cos(radLat) * PI);
+      return {longitude: lng + dLng, latitude: lat + dLat};
+    },
+    //#endif
+
+    // #ifdef MP-WEIXIN
+    /**
+     * @description 小程序获取位置
+     * @description 根据 mpLocationFnCoords 选择调用 getFuzzyLocation(模糊，无需授权) 或 getLocation(精确，需授权)
+     */
+    getWxLocation(){
+      return new Promise((resolve, reject) => {
+        const locationFn = this.mpLocationFnCoords || 'getFuzzyLocation';
+
+        const doLocate = () => {
+          this.locateWithFallback((opts) => uni[locationFn](opts), resolve, reject);
+        };
+
+        //精确 getLocation 需要 scope.userLocation 授权
+        if (locationFn === 'getLocation') {
+          uni.getSetting({
+            success: (res) => {
+              if (res.authSetting['scope.userLocation']) {
+                doLocate();
+              } else {
+                uni.authorize({
+                  scope: 'scope.userLocation',
+                  success: doLocate,
+                  fail: () => reject('定位权限被拒绝')
+                });
+              }
+            },
+            fail: () => reject('获取授权设置失败')
+          });
+        }
+        else {
+          //getFuzzyLocation 模糊定位，无需授权
+          doLocate();
+        }
+      });
+    },
+    // #endif
+
+  }
+}