gxd-uni-library-editx 1.0.37 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdButton/XdButton.vue

@@ -29,7 +29,7 @@
     getParentsStyle, //获取页面风格单个键值值
     getParentsStyles //获取页面风格列表
   } from '@/utils/xd.base';
-  
+
   /**
    * XdButton 按钮UI
    * @description 按钮组件
@@ -56,7 +56,7 @@
         type: String,
         default: ''
       },
-  
+
       systemStyle: {
         type: Object|null,
         default: null
@@ -123,7 +123,7 @@
         default: 'to bottom',
       },
       /**仅支持线性渐变******/
-  
+
       isBoxShadow:{
         type: Boolean,
         default: false,
@@ -230,12 +230,12 @@
       this.status = true;
     },
     methods:{
-      
+
       handleClick(e){
         this.$emit('click',e);
         this.$emit('tap', e);
       },
-      
+
       getInfo(type, dataKey, list='btnHeightList'){
         if (this[dataKey]) {
           let temp = this[dataKey];
@@ -280,7 +280,7 @@
         if (this.uiType === 'subPrimary') {
           return this.btnBtnColor.subGradient ||  this.getColor();
         }
-       
+
         let bgc = this.getColor();
         if (this.isGradual && this.gradualColor && this.gradualType) {
           bgc =`linear-gradient(${this.gradualType}, ${this.gradualColor})`;

package/src/components/XdCityApi/XdCityApi.vue

@@ -1,12 +1,8 @@
 <template>
 	<view class="xd-city-box">
+    <xd-city-location ref="location" @cityAndLocation="handleCityAndLocationDone" baidu is-select></xd-city-location>
     <view class="xd-city" v-if="allCityList.length > 0">
-      <view class="xd-city__header"
-        :style="{
-          height: customBar + 'rpx',
-          top: top + 'rpx',
-        }"
-      >
+      <view class="xd-city__header" :style="{height: customBar + 'rpx',top: top + 'rpx'}">
         <view>
           <input
             class="xd-city__header-input"
@@ -109,7 +105,6 @@
         <!-- 选中之后字母 结束-->
       </view>
     </view>
-    <xd-city-location v-if="loaded" @done="handleDone" baidu></xd-city-location>
 	</view>
 </template>
 
@@ -149,44 +144,22 @@
         type: Number,
         default: 0 //px
       },
-
-      getCityInfoByLocation: {
-        type: Function,
-      }
     },
-    computed: mapState({
-      cityLocation: state => state.cityLocation
-    }),
+
 		data() {
 			return {
 			  listInfo: null, //城市列表信息
         allCityList: [], //城市一维数组列表
-        threeLocation: null, //第三方定位信息
-
         hotCityList: [], //热门城市列表
         cityList: null, //城市列表
         cityLetter: [],//城市字母排序
-
         customBar: 90, //搜索区域高度
         scrollHeight: null, //内容区域高度
         callbackUrl: null, //访问回调地址
 
-
-
-        //定位信息
-        position: {
-          city_name: '定位中..', city_id: -1
-        }, //定位获取的位置
-
-        //测试定位城市
-        testLocationItem: {
-          "city_id": "110100",
-          "city_name": "北京市",
-          "province_name": "北京市",
-          "city_pinyin": "",
-          "py": "",
-          "letter": "B"
-        },
+        //定位获取的位置
+        position: {city_name: '定位中..', city_id: -1},
+        locationInfo: null,
 
         tId: null,
         showMask: false,
@@ -203,22 +176,17 @@
         //城市信息
         cityLastMaxLen: 5, //保存最近访问记录最大数据
         cityLastSaveKey: 'xd_user_last_access_cities',
-        locationStorageKey: "xd_three_map",
-        rejectSave: 'xd-user-reject-location',
-        currentLocationCity: 'jfb_current_ajax_location_city',
+        prevUserSelectCityKey:'xd_user_select_access_city',
+        prevUserLocationCityKey:'xd_user_current_access_city',
+        //定位成功保存数据（定位成功就保存等待有组件需要弹出时候转化xd_three_map）
+        locationSuccessKey: 'xd_three_map_success',
+        //定位成功保存数据（定位成功就保存等待有组件需要弹出时候转化 prevUserLocationCityKey)
+        prevUserlocationCitySuccessKey: 'xd_user_location_success_city',
         cityCacheLocation: [], //最近访问列表记录
-
-        loaded: false, //页面加载完成
-        reloading: false,
-
 			}
 		},
 
     created(){
-      
-      this.$nextTick(() => {
-        this.loaded = true;
-      })
       this.init();
     },
 
@@ -234,43 +202,31 @@
           this.cityCacheLocation = storage.get(this.cityLastSaveKey);
         }
       });
+
     },
 		methods: {
-      ...mapMutations(['setCityInfo', "clearLocation"]),
-      
+      ...mapMutations(['setLocationCity']),
+
       handleReloadPosition(){
         this.$xdShowLoading({});
-        this.reloading = true;
-        this.loaded = false;
-        this.position = {city_name: '定位中', city_id: -1};
-        this.clearLocation();
-        storage.remove(this.rejectSave);
-        storage.remove(this.currentLocationCity);
-        setTimeout(()=>{
-          this.loaded = true;
-        }, 10)
-      },
-      
-      handleDone(location){
-        if(this.reloading) {
+        this.position = {city_name: '定位中..', city_id: -1};
+        this.$refs['location'].reloadLocation((city, location)=>{
+          this.locationInfo = location;
+          this.getLocationCityName(city);
           this.$xdHideLoading();
-          this.reloading = false;
-        }
-        this.threeLocation = location;
-        this.getLocationCityName();
+        })
+      },
+
+      handleCityAndLocationDone({location, city}){
+        this.locationInfo = location;
+        this.getLocationCityName(city);
       },
 
       init(){
-        this.$emit('getCityList',{location: this.threeLocation},
-          /**
-           * @description 城市列表
-           * @param cityList
-           */
-          (cityList)=>{
-            this.listInfo = this.$xdUniHelper.cloneDeep(cityList)
-            this.toList();
-          }
-        )
+        this.$emit('getCityList',{location: null},(cityList)=>{
+          this.listInfo = this.$xdUniHelper.cloneDeep(cityList)
+          this.toList();
+        })
       },
 
       toList(){
@@ -287,28 +243,15 @@
         this.setAppLettersList();
       },
 
-      p_getCityInfoByLocation(location){
-        let callThis = this;
-        // #ifdef MP
-        callThis = this.$parent;
-        // #endif
-        return new Promise((r, j) => {
-          callThis.getCityInfoByLocation(location, (res) => {
-            storage.set(this.currentLocationCity, res.data, .5);
-            r(res.data);
-          })
-        })
-      },
-
       /***
        * @description  获取第三方定位信息
        */
-      async getLocationCityName(){
-        try{
-          let cityInfo = await this.p_getCityInfoByLocation(this.threeLocation);
-          this.position = Object.assign({}, cityInfo, {city_id: cityInfo.city_code});
-        }catch(err){
-          this.position = {city_name: '定位失败', city_id: -2};
+      getLocationCityName(city){
+        if(city.is_default === 'Y' ||city.is_default === 'N') {
+          this.position = city;
+        }
+        else {
+          this.position = {city_name: '定位失败', city_id: -1}
         }
       },
 
@@ -319,8 +262,13 @@
         this.doneInput();
         setTimeout(()=>{
           if (item) {
-            storage.remove('xd_user_current_access_city');
-            this.setCityInfo(item);
+            storage.set(this.prevUserSelectCityKey,item)
+            storage.remove(this.locationSuccessKey)
+            storage.remove(this.prevUserlocationCitySuccessKey)
+            this.setLocationCity({
+              city:item,
+              location: this.locationInfo,
+            })
             this.$xdRoot.$emit('selectCity', item);
           }
           if (this.callbackUrl) {
@@ -358,7 +306,6 @@
         };
         handle();
 			},
-
 			touchStart(e) {
 				this.touchmove = true
 				let pageY = e.touches[0].pageY
@@ -381,7 +328,6 @@
 				this.touchmove = false
 				this.touchmoveIndex = -1
 			},
-
 			doneInput(){
 				uni.hideKeyboard()
 			},
@@ -437,10 +383,15 @@
        * @param item
        */
       handleSelected(item) {
+        //定位中与定位失败不能处理
         if(item.city_id === -1) {
           return;
         }
-        Object.assign(item, {city_code: item.city_id});
+
+        //code不存在使用item.city_id进行赋值
+        if(!item.city_code) {
+          Object.assign(item, {city_code: item.city_id, is_default: 'S'});
+        }
 
         //在最近访问记录中无数据
         if(!this.$xdUniHelper.isKeyInLists(this.cityCacheLocation, item['city_id'], 'city_id')){
@@ -497,8 +448,8 @@
       }
     }
   }
-  
-  
+
+
   .fsmall {font-size: @xd-font-size-base;}
   .fmiddle {font-size: @xd-font-size-base + 2rpx;}
 	.blue {color: #007AFF;}
@@ -578,7 +529,7 @@
     justify-content: flex-start!important;
     align-items: center;
     padding-bottom: unit(20, rpx);
-    
+
     & > view:first-child {
       margin-bottom: 0;
     }

package/src/components/XdCityLocation/XdCityLocation.vue

@@ -1,11 +1,18 @@
 <template>
-  <!--#ifdef H5-->
-  <xd-baidu-map
-    v-if="baidu && initBaidu"
-    :ak="uiBaiduAk"
-    @onLocationSuccess="handleBaiduInit"
-  ></xd-baidu-map>
-  <!--#endif-->
+  <view>
+    <!--#ifdef H5-->
+    <baidu-map
+      class="xd-baidu__content"
+      v-if="baiduAKConfig && initBaidu"
+      :ak="baiduAKConfig"
+      @ready="handleBaiduReady"
+    >
+    </baidu-map>
+    <!--#endif-->
+  </view>
+
+
+
 </template>
 
 <script>
@@ -13,6 +20,7 @@
   /**
    * XdCityLocation
    *  * 参考网站如下：
+   * https://dafrok.github.io/vue-baidu-map/#/zh/start/usage
    * https://lbsyun.baidu.com/cms/jsapi/reference/jsapi_webgl_1_0.html#a3b0
    * https://lbsyun.baidu.com/index.php?title=jspopularGL/guide/addOverlay
    * https://lbs.baidu.com/jsdemo.htm#fEditOverlay
@@ -27,22 +35,24 @@
 
    * @event {Function} getWeixinAppInfo  使用微信定位使用需要获取
    */
-
+  import newLocaltionMixins from "@/mixins/newLocaltionMixins";
   // #ifdef H5
   import XdBaiduMap from "@/components/XdBaiduMap/XdBaiduMap";
-  import {isWechat, isPlatform, baseEnvTypeReg} from "@/utils/xd.base";
+  import BaiduMap from 'vue-baidu-map/components/map/Map.vue';
+  import BmGeolocation from 'vue-baidu-map/components/controls/Geolocation';
   // #endif
-  import { mapState, mapMutations, mapActions } from "vuex"
-  import storage from "@/common/storage";
 
 
   export default {
     name: "XdCityLocation",
     components: {
       // #ifdef H5
-      XdBaiduMap
+      XdBaiduMap,
+      BaiduMap,
+      BmGeolocation
       // #endif
     },
+    mixins:[newLocaltionMixins],
     props:{
       /**
        * @description 使用百度定位支持H5 需要在/public/index.html 添加下面的地址
@@ -70,261 +80,28 @@
       expire: {
         type: Number,
         default: 1
-      }
-    },
-    data(){
-      return {
-        //微信参数
-        isWx: false,
-        time: 0,
-
-        location: {},
-        baiduCount: 0, //baidu  API 加载次数
-        backed: false,
-        initBaidu: false,
-        uiBaiduAk: '',
-
-        failStatus: false,
-        timeStatus: null,
-        permanentSave: 'xd-user-permanent-location-config',
-        rejectSave: 'xd-user-reject-location',
-        locationStorageKey: "xd_three_map"
-      }
-    },
-    created() {
-      //#ifdef H5
-      //微信环境定位
-      if(isWechat()) {
-        this.isWx = true;
-        this.init();
-        return
-      }
-
-      //百度定位
-      this.uiBaiduAk = this.baiduAk || this.$settings.baiduAk;
-      if(this.baidu){
-        if(!this.uiBaiduAk) {
-          console.error('请传入百度AK值')
-          throw new Error('请传入百度AK值');
-        }else {
-          this.initBaidu = true;
-          this.init();
-        }
-      }
-
-      //默认
-      else{
-        this.init();
-      }
-      // #endif
-
-      // #ifdef MP-WEIXIN
-      this.init();
-      // #endif
-
-    },
-    methods:{
-      ...mapMutations(['setLocationInfo']),
-      ...mapActions(['getH5WxAuthorize']),
-
-      getLocationData(){
-        return storage.get(this.locationStorageKey);
-      },
-
-      /**
-       * @description 火星转百度坐标
-       * @param lng
-       * @param lat
-       * @returns {{latitude: *, longitude: *}}
-       */
-      gcj02tobd09(lng, lat) {
-        let x_PI = 3.14159265358979324 * 3000.0 / 180.0;
-        let PI = 3.1415926535897932384626;
-        let a = 6378245.0;
-        let 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}
-      },
-
-      wxLocation(){
-        //被拒绝之后不在启动授权功能
-        if(storage.get(this.rejectSave) === true) {
-          let location = {
-            lng: null,
-            lat: null
-          };
-          this.$xdLog.setProject('Location.wx.jwxSDK.reject', location);
-          this.handleBaiduInit(null);
-          return
-        }
-
-        //启动微信授权功能
-        this.getH5WxAuthorize({jsApiList: ['openLocation', 'getLocation']})
-          .then(({jwxSDK}) => {
-            this.$xdLog.setProject('Location.jwxSDK.init', 'Location.jwxSDK.init');
-
-            //pc端端微信环境直接返回
-            if(isPlatform().isPc ||
-              (jwxSDK && typeof jwxSDK.getLocation !== 'function')
-            ) {
-              this.$xdLog.setProject('Location.wx.jwxSDK.not.support', {
-                lng: null,
-                lat: null
-              });
-              this.handleBaiduInit(null);
-              return
-            }
-
-            let time = null;
-            let isReturn = false;
-
-            //手机端微信环境
-            jwxSDK.getLocation({
-              type: 'gcj02',
-              success: (res) => {
-                let location = this.gcj02tobd09(res.longitude, res.latitude);
-                this.location = {
-                  latitude: location['latitude'],
-                  longitude: location['longitude'],
-                  address: {}
-                };
-                let temp = JSON.parse(JSON.stringify(this.location))
-                this.$xdLog.setProject('Location.wx.api.done', {
-                  lng: location.longitude,
-                  lat: location.latitude
-                });
-                setTimeout(()=>{
-                  this.handleBaiduInit(temp);
-                  if(time){
-                    clearTimeout(time);
-                    time=null
-                  }
-                }, 10)
-              },
-              fail: (e) => {
-                //已超时返回
-                if(isReturn) {
-                  time = null;
-                  return;
-                }
-
-                //比超时返回快
-                if(time) {
-                  clearTimeout(time);
-                  time=null;
-                }
-
-                this.$xdLog.setProject('Location.wx.api.fail', {
-                  lng: null,
-                  lat: null,
-                  error:e
-                });
-                this.handleBaiduInit(null)
-              },
-              cancel: (e) => {
-                if(time){
-                  clearTimeout(time);
-                  time=null
-                }
-                this.$xdLog.setProject('Location.wx.api.cancel', {
-                  lng: null,
-                  lat: null
-                });
-                storage.set(this.rejectSave, true);
-                this.handleBaiduInit(null)
-              }
-            });
-
-            //超时处理
-            time = setTimeout(()=>{
-              this.$xdLog.setProject('Location.wx.api.fail.timeout', {
-                lng: null,
-                lat: null,
-                error:'fail.timeout'
-              });
-              this.handleBaiduInit(null);
-              isReturn = true;
-            }, 4000)
-          })
-          .catch(res => {
-            this.$xdLog.setProject('Location.wx.jwxSDK.fail', {
-              lng: null,
-              lat: null
-            });
-            this.handleBaiduInit(null)
-          });
-      },
-
-      /**
-       * @description 主要针对百度定位超时进行返回操作
-       */
-      setTimeoutLocation(){
-        if (this.getLocationData() === null) {
-          this.timeStatus = setTimeout(() => {
-            this.$emit('done', null);
-            this.failStatus = true;
-            this.$xdLog.setProject('Location.timeout.baidu', 'Location.timeout.10s');
-          }, 4000)
-        }
       },
 
-      init(){
-        if(this.getLocationData() !== null){
-          this.$xdLog.setProject('Location.cache', this.getLocationData());
-          this.$emit('done', this.getLocationData());
-          if(!this.showSwitchCity) return;
-        }
-
-        //#ifdef H5
-        //微信公众号定位
-        if(this.isWx) {
-          if(this.getLocationData() === null){
-            this.wxLocation()
-          }
-          return;
-        }
-
-        //百度定位
-        if(this.isWx === false) {
-          // 没有定位信息并且超时5秒
-          this.setTimeoutLocation();
-        }
-        // #endif
-      },
-
-      handleDone(){
-        this.setLocationInfo(this.location);
-
-        //超过5秒就不走这里的逻辑
-        if(this.failStatus === false) {
-          this.$xdLog.setProject('Location.done', this.location);
-          this.$emit('done', this.location);
-          clearTimeout(this.timeStatus);
-        }
+      isPop:{
+        type: Boolean,
+        default: false
       },
 
-      handleBaiduInit(location){
-        if(location === null) this.location = null;
-        else{
-          this.location = {
-            latitude: location['latitude'],
-            longitude: location['longitude'],
-            address: location['address']
-          };
-          storage.set(this.permanentSave, this.location);
-        }
-        this.handleDone();
+      isSelect:{
+        type: Boolean,
+        default: false
       },
-    }
+    },
   }
 </script>
 
 <style scoped>
-
+  .xd-baidu__content {
+    position: fixed;
+    top:-99999px;
+    left: -99999px;
+    overflow: hidden;
+    width: 100vw;
+    height: 100vh;
+  }
 </style>

package/src/components/XdCityShowApi/XdCityShowApi.vue

@@ -11,18 +11,16 @@
       </slot>
     </view>
     <view>
-      <xd-city-location @done="handleDone"></xd-city-location>
+      <xd-city-location @cityAndLocation="handleDone" is-pop></xd-city-location>
     </view>
   </view>
 
 </template>
 
 <script>
-  import storage from "@/common/storage";
   import XdCityLocation from "@/components/XdCityLocation/XdCityLocation";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { mapState, mapMutations } from "vuex"
-  import {baseEnvTypeReg} from '@/utils/xd.base';
 
   /**
    * XdCityShow
@@ -60,11 +58,7 @@
 
     data(){
       return {
-        cityInfo: {},
-        currentLocationCity: 'jfb_current_ajax_location_city',
-        useSelectCity: 'xd_user_current_access_city',
-        userUsePopStatus: 'jfb_show_switch_city',
-        userUsePopStatusTime: 1,
+        cityInfo: null,
       }
     },
 
@@ -74,76 +68,17 @@
       }),
       getCityName(){
         if (this.$configProject.isPreview) return this.$xdUniHelper.cutStringLen(this.$settings.defaultCity.city_name, 6);
-        if(!this.stateCity.city_name) return  '定位失败';
-        return this.$xdUniHelper.cutStringLen(this.stateCity.city_name, 6)
-      }
-    },
-
-
-    created(){
-      if ((this.$configProject && this.$configProject.isPreview)
-        || (this.$configProject.platform === 'h5' && baseEnvTypeReg.test(window.location.host))
-      ) {
-        this.userUsePopStatusTime = 0.01;
+        if(this.stateCity) {
+          return this.$xdUniHelper.cutStringLen(this.stateCity.city_name, 6)
+        }
+        else return '定位中...'
       }
-      this.cityInfo = storage.get(this.useSelectCity) || {};
     },
 
     methods:{
-      ...mapMutations(['setCityInfo']),
-
-      handleDone(location) {
-        let currentCode = null;
-        let current = {};
-        let useCode = null;
-        let switchStatus = storage.get(this.userUsePopStatus);
-
-        //接口有返回值
-        if (storage.get(this.currentLocationCity)){
-          current = storage.get(this.currentLocationCity);
-          currentCode = current.city_code;
-        }
-
-        //当前选中的城市为默认城市直接替换
-        if(storage.get(this.useSelectCity) && storage.get(this.useSelectCity).isDefault) {
-
-          //设置的是默认值
-          if(this.$xdUniHelper.isEmpty(current)) {
-            this.$emit("done", {city: storage.get(this.useSelectCity), location: this.location});
-            return;
-          }
-          storage.remove(this.useSelectCity);
-          this.setCityInfo(current);
-          this.$emit("done", {city: current, location: this.location});
-          return;
-        }
-
-        if (storage.get(this.useSelectCity)) useCode = storage.get(this.useSelectCity).city_code;
-
-        //需要进行切换逻辑
-        if(!switchStatus && (currentCode && useCode) && currentCode !== useCode) {
-          uni.showModal({
-            title: '提示',
-            content: `定位显示您在：${current['province_name']}-${current['city_name']}`,
-            confirmText: '切换到',
-            success: (res) => {
-              if (res.confirm) {
-                this.cityInfo = current;
-                storage.remove(this.useSelectCity);
-                this.setCityInfo(this.cityInfo);
-                this.$emit("done", {city: this.cityInfo, location});
-              } else if (res.cancel) {
-                storage.set(this.userUsePopStatus, 1, this.userUsePopStatusTime);
-                this.cityInfo = storage.get(this.useSelectCity);
-                this.$emit("done", {city: this.cityInfo, location});
-              }
-            }
-          });
-          return
-        }
-
-        //直接返回
-        this.$emit("done", {city: current, location: this.location});
+      handleDone({location , city}) {
+        this.cityInfo = city;
+        this.$emit("done", {city, location});
       },
 
       /**

package/src/components/XdConfirm/XdConfirm.vue

@@ -81,8 +81,19 @@
     },
     computed: {
       ...mapState([
-        'xdInputConfirm'
-      ])
+        'xdInputConfirm',
+        'styleCommon',
+      ]),
+      ...mapState({
+        currentStyle:(state)=>{
+          let style = {};
+          Object.keys(state.currentStyle).map(key=>{
+            style[`$${key}`] = state.currentStyle[key];
+          });
+          return style
+        }
+      })
+
     },
     data() {
       return {
@@ -159,7 +170,10 @@
           this.show = false;
           this.confirm = {}
         } else {
-          this.$currentStyle = (value.$vm && value.$vm.styles) || {};
+          this.$currentStyle = value.styles
+            || (this.styleCommon && this.styleCommon.styles)
+            || this.currentStyle ||
+            (value.$vm && value.$vm.styles) || {};
           this.confirm = Object.assign({},
             this.$xdUniHelper.cloneDeep(this.defaultConfirm),
             value,

package/src/components/XdLayout/XdLayout.vue

@@ -122,10 +122,7 @@
     <xd-tips v-if="getLayoutInfo" :get-layout-info="getLayoutInfo"></xd-tips>
     <view class="xd-Layout__padding" id="xd-Layout__padding"></view>
     <view class="xd-Layout__padding-placeholder" :style="{backgroundColor: background}"></view>
-    <xd-city-location
-      v-if="open"
-      @done="handleLocationDone"
-    ></xd-city-location>
+    <xd-city-location v-if="open"></xd-city-location>
   </view>
 </template>
 
@@ -137,9 +134,9 @@
   import XdLoading from "@/components/XdLoading/XdLoading";
   import XdTips from "@/components/XdTips/XdTips";
   import XdCityLocation from "@/components/XdCityLocation/XdCityLocation";
-  import locationMixins from "@/mixins/locationMixins";
   import XdAppClass from "@/XdAppClass";
   import {mapState} from 'vuex';
+  import supportLocation from "@/common/supportLocation";
 
 
   /**
@@ -177,7 +174,7 @@
       XdBar,
       XdCityLocation
     },
-    mixins: [locationMixins],
+    mixins: [],
     props: {
       scrollDetail:{
         type: Number,
@@ -264,7 +261,13 @@
         default: false, //false=自定义 true=系统导航
       },
 
-
+      //当前页面支持的组件
+      componentAttr:{
+        type: Object,
+        default(){
+          return {}
+        },
+      }
     },
     data() {
       return {
@@ -504,11 +507,6 @@
         }
         this.doneLayoutAndLocation()
       },
-
-      //定位完成
-      locationStatus(value){
-        this.doneLayoutAndLocation()
-      }
     },
 
     created() {
@@ -535,17 +533,29 @@
       })
       // #endif
 
-
       //定位设置
       if (this.$configProject.isPreview === false
         && this.$configProject.extras
         && this.$configProject.extras.is_open_location === 'Y'
         && !this.checkPathIsLoginAndOrCard()
       ) {
-        this.open = true;
-        this.locationStatus = false;
+        let com = Object.keys(this.componentAttr).filter(key=>{
+          const name = key.split('-')[0];
+          return supportLocation.includes(name)
+        });
+
+        //页面内部组有支持定位组件时候（组件内部进行定位）
+        if(com.length > 0){
+          this.open = false;
+          console.warn(`has.support.location.component:${JSON.stringify(com)}`)
+        }
+
+        //页面内部无支持定位组件时候（在框架组进行定位）
+        else {
+          console.warn(`no.support.location.component:${JSON.stringify(com)}`)
+          this.open = true;
+        }
       }
-      else this.locationStatus = true;
 
       //切换页面之后数据清空
       this.uiErrorLogs = this.errorLogs;
@@ -621,7 +631,8 @@
       },
 
       doneLayoutAndLocation(){
-        if (this.locationStatus && this.layoutLoading) {
+        if (this.layoutLoading) {
+          console.log(this.$settings.defaultCity);
           this.$emit('onDone', this.getLayoutInfo);
           this.$emit('done', this.getLayoutInfo);
           this.$xdLog.setProject('Layout.done', {...this.getLayoutInfo, time: new Date().getTime() - this.startTime})