jufubao-base 1.0.373 → 1.0.375

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.373",
+  "version": "1.0.375",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseFastLink/cusAttr/advanced.js

@@ -46,7 +46,8 @@ export default (data, gValue, gColor, oldData={})=>{
           isPath: false,
           isService: true,
           isWX: true,
-          isPhone: true
+          isPhone: true,
+          isNoUrl: true,
         }
       },
       handleCustom({action,data}){

package/src/components/JfbBaseMapOverlay/XdBaiduOverlay.vue

@@ -11,7 +11,7 @@
     >
       <bm-navigation anchor="BMAP_ANCHOR_TOP_RIGHT" type="NavigationControlType"></bm-navigation>
       <bm-geolocation
-        v-if="isGeolocation"
+        v-if="isGeolocation && !isWebviewMp"
         @locationSuccess="handleLocationSuccess"
         class="xd-baidu__content-geolocation"
         anchor="BMAP_ANCHOR_BOTTOM_RIGHT"
@@ -230,12 +230,14 @@
         //判断地图是否加载完成
         BMap: null,
         loaded: false,
+        isWebviewMp: false,//是否是小程序套嵌情况
       }
     },
 
 
     created() {
       this.uiAk = this.$settings.baiduAk || this.ak;
+      this.isWebviewMp = !!navigator.userAgent.match(/miniprogram/i);
       if(!this.uiAk) throw new Error('请传入百度AK值');
       else{
         let uiCenter = '北京';
@@ -292,24 +294,34 @@
 
       handleInitDone({BMap}){
         if(this.isGeolocation) {
-          let geolocation = new BMap['Geolocation']();
-          geolocation['enableSDKLocation']();
-          geolocation.getCurrentPosition(
-            (location) => {
-              console.log('handleInitDone',location)
-              if(!this.defaultOverlays || this.defaultOverlays.length === 0) {
-                let point = this.$xdUniHelper.cloneDeep(location.point);
-                delete point['of']
-                this.uiGeolocation = point;
-                this.uiLevel = 15;
-                this.uiCenter = point;
+
+          //非小程序套嵌情况
+          if(!this.isWebviewMp){
+            let geolocation = new BMap['Geolocation']();
+            geolocation['enableSDKLocation']();
+            geolocation.getCurrentPosition(
+              (location) => {
+                console.log('handleInitDone',location)
+                if(!this.defaultOverlays || this.defaultOverlays.length === 0) {
+                  let point = this.$xdUniHelper.cloneDeep(location.point);
+                  delete point['of']
+                  this.uiGeolocation = point;
+                  this.uiLevel = 15;
+                  this.uiCenter = point;
+                }
+                this.$emit('onLocationSuccess',location);
+              },
+              (error) => {
+                console.log('handleInitDone',error)
               }
-              this.$emit('onLocationSuccess',location);
-            },
-            (error) => {
-              console.log('handleInitDone',error)
-            }
-          )
+            )
+          }
+
+          //小程序套嵌情况
+          else {
+            //todo
+          }
+
         }
       },