gxd-uni-library-editx 1.0.8-beta22 → 1.0.8-beta24

package/package.json

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

package/src/components/XdCityApi/XdCityApi.vue

@@ -19,7 +19,7 @@
             v-model="searchValue"
           />
         </view>
-        <view class="" @tap="backPrevPage()">返回</view>
+        <view class="" @tap="backPrevPage">返回</view>
       </view>
       <view class="xd-city__header-box" :style="{height: customBar + 'rpx'}"></view>
       <view class="xd-city__content" v-if="scrollHeight !== null">
@@ -115,6 +115,7 @@
   import storage from "@/common/storage";
   import helper from "@/utils/helper";
   import XdCityLocation from "@/components/XdCityLocation/XdCityLocation";
+  import { mapState, mapMutations } from "vuex"
 
   /**
    * XdCity
@@ -148,8 +149,10 @@
       getCityInfoByLocation: {
         type: Function,
       }
-
     },
+    computed: mapState({
+      cityLocation: state => state.cityLocation
+    }),
 		data() {
 			return {
 			  listInfo: null, //城市列表信息
@@ -197,7 +200,6 @@
         cityLastMaxLen: 5, //保存最近访问记录最大数据
         cityLastSaveKey: 'xd_user_last_access_cities',
         cityCacheLocation: [], //最近访问列表记录
-        saveKey: 'xd_user_current_access_city', //用户选中城市存储key
 
 			}
 		},
@@ -217,6 +219,7 @@
       });
     },
 		methods: {
+      ...mapMutations(['setCityInfo']),
       handleDone(location){
         console.log('location', location);
         this.threeLocation = location;
@@ -306,8 +309,8 @@
         setTimeout(()=>{
           let routes = this.$xdUniHelper.getCurrentPages();
           if (item) {
-            storage.set(this.saveKey, item, 24);
-            console.log('$xdRoot.selectCity', item);
+            // console.log('$xdRoot.selectCity', item);
+            this.setCityInfo(item);
             this.$xdRoot.$emit('selectCity', item);
           }
 
@@ -428,6 +431,7 @@
         if(item.city_id === -1) {
           return;
         }
+        Object.assign(item, {city_code: item.city_id})
 
         //在最近访问记录中无数据
         if(!this.$xdUniHelper.isKeyInLists(this.cityCacheLocation, item['city_id'], 'city_id')){

package/src/components/XdCityLocation/XdCityLocation.vue

@@ -32,7 +32,7 @@
   import {initWeixin} from "@/components/XdCityLocation/jweixin";
   import XdBaiduMap from "@/components/XdBaiduMap/XdBaiduMap";
   // #endif
-  import storage from "@/common/storage";
+  import { mapState, mapMutations } from "vuex"
 
 
   export default {
@@ -71,6 +71,9 @@
         default: 1
       }
     },
+    computed: mapState({
+      stateLocation: state => state.cityLocation.location
+    }),
     data(){
       return {
         location: {},
@@ -102,18 +105,11 @@
 
     },
     methods:{
+      ...mapMutations(['setLocationInfo']),
       init(){
-        //从storage获取定位信息
-        if(storage.get('xd_three_map')) {
-          if (typeof getApp()['saveLogs'] === 'function' && this.$settings['isDebug']) {
-            getApp()['saveLogs']({
-              location: storage.get('xd_three_map'),
-              status: 'ok',
-              locationType: 'cache',
-              pos: 'XdCityLocation'
-            }, 'info');
-          }
-          this.$emit('done', storage.get('xd_three_map'));
+
+        if(this.stateLocation){
+          this.$emit('done', this.stateLocation);
           return;
         }
 
@@ -139,9 +135,7 @@
         console.log('handleDone', this.location);
         if(this.backed) return;
         this.backed = true;
-        if(this.location) {
-          storage.set('xd_three_map', this.location, this.expire);
-        }
+        this.setLocationInfo(this.location);
         console.log('handleDone',this.location);
         this.$emit('done', this.location);
       },
@@ -299,7 +293,7 @@
             };
             this.handleDone()
           },
-          fail: ()=>{
+          error: ()=>{
             this.location = null;
             this.handleDone()
           }

package/src/components/XdCityShowApi/XdCityShowApi.vue

@@ -24,6 +24,7 @@
   import storage from "@/common/storage";
   import XdCityLocation from "@/components/XdCityLocation/XdCityLocation";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { mapState, mapMutations } from "vuex"
 
   /**
    * XdCityShow
@@ -57,51 +58,49 @@
       return {
         cityInfo: null,
         threeLocation: null,
-        saveKey: 'xd_user_current_access_city', //用户选中城市存储key
       }
     },
 
     computed:{
+      ...mapState({
+        stateCity: state => state.cityLocation.city,
+        stateLocation: state => state.cityLocation.location
+      }),
       getCityName(){
-        if(this.cityInfo === null) return  '';
-        else return this.$xdUniHelper.cutStringLen(this.cityInfo.city_name, 6)
+        if(!this.stateCity) return  '';
+        else return this.$xdUniHelper.cutStringLen(this.stateCity.city_name, 6)
       }
     },
 
 
     created(){
-      this.$xdRoot.$on('selectCity', (city)=>{
-        console.log('$xdRoot.selectCity', city);
-        this.init();
-      });
+     
     },
 
     methods:{
+      ...mapMutations(['setLocationInfo', 'setCityInfo']),
       async init(){
-        console.log("storage.get(this.saveKey)", storage.get(this.saveKey))
         //缓存中获取用户定位信息
-        if (storage.get(this.saveKey)) {
-          this.cityInfo = storage.get(this.saveKey);
-          this.threeLocation = storage.get("xd_three_map");
+        if (this.stateCity) {
         } else {
           await this.getCity();
         }
-        this.$emit("done", {city: this.cityInfo, location: this.threeLocation});
+        this.$emit("done", {city: this.stateCity, location: this.stateLocation});
       },
       async getCity(){
-        let location = this.threeLocation;
-        if(location){
-          let cityInfo = await this.p_getCityInfoByLocation(location) 
-          storage.set(this.saveKey, cityInfo);
-          this.cityInfo = cityInfo;
+        // let location = this.threeLocation;
+        if(this.stateLocation){
+          let cityInfo = await this.p_getCityInfoByLocation(this.stateLocation) ;
+          this.setCityInfo(cityInfo);
         }else{
-          this.cityInfo = this.$settings.defaultCity;
+          let cityInfo = this.$settings.defaultCity;
+          this.setCityInfo(cityInfo);
         }
       },
 
       handleDone(location) {
         console.log('location', location);
-        this.threeLocation = location;
+        this.setLocationInfo(location);
         this.init();
       },
       p_getCityInfoByLocation(location){

package/src/components/XdLayout/XdLayout.vue

@@ -23,6 +23,7 @@
           width: '100%',
           backgroundColor: barBgColor,
           backgroundImage: getNavBackImage,
+          zIndex: (wiewType ? 1300: 999)
         }
       ">
         <xd-bar
@@ -44,6 +45,7 @@
       <view class="xd-Layout__top animation-top"
         v-show="contentStatus"
         :style="{
+          paddingTop: windowTop + 'rpx',
           height: topHeight + 'rpx',
           top: (navBarHeight + statusBarHeight) + 'rpx',
           zIndex: (wiewType ? 1490: 1001)
@@ -309,6 +311,10 @@
           return `url("${this.bgImage}")`
         }
       },
+      
+      windowTop(){
+        return this.getRpx(uni.getSystemInfoSync().windowTop || 0)
+      },
   
       getBodyBackImagePosition(){
         let windowTop = uni.getSystemInfoSync().windowTop || 0;
@@ -423,6 +429,12 @@
       //重缓存中获取底部安全距离
       if(uni.getStorageSync('xd-layout')) {
         this.safeHeight = uni.getStorageSync('xd-layout')['safeHeight'];
+        //修复刘海初始化值为0
+        if(this.safeHeight === 0) {
+          this.handleSafeBottom();
+        }
+        console.warn(`xd-layout.storage: ${JSON.stringify(this.safeHeight)}`);
+        console.warn(`xd-layout.system: ${JSON.stringify(this.systemInfoSyn)}`);
         this.getSafeBottom();
       }
       
@@ -488,28 +500,18 @@
         
         this.createTime = new Date().getTime() - this.startTime;
       },
-
-      /**
-       * @description 获取底部安全距离数据
-       */
-      getSafeBottom(){
-        //已缓存安全距离
-        if(this.safeHeight !== null) {
-          this.time = new Date().getTime() - this.startTime;
-          this.initStatus = true;
-          this.layoutDone();
-          return
-        }
-
+      
+      handleSafeBottom(){
         //未缓存安全距离
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.$xdUniHelper.getWindowHeight(['#xd-Layout__padding'], this)
-            .then(res=>{
+            .then(res => {
+              console.warn(`xd-layout.getWindowHeight: ${JSON.stringify(res)}`)
               this.safeHeight = Math.max(
                 this.getRpx(res['#xd-Layout__padding']['height']),
                 this.systemInfoSyn.safeAreaInsets.bottom
               );
-
+        
               this.time = new Date().getTime() - this.startTime;
               this.initStatus = true;
               //保存计算属性
@@ -520,6 +522,21 @@
             })
             .catch()
         })
+      },
+
+      /**
+       * @description 获取底部安全距离数据
+       */
+      getSafeBottom(){
+        //已缓存安全距离
+        if(this.safeHeight !== null) {
+          this.time = new Date().getTime() - this.startTime;
+          this.initStatus = true;
+          this.layoutDone();
+          return
+        }
+
+        this.handleSafeBottom();
 
       },