gxd-uni-library-editx 1.0.22 → 1.0.24

package/package.json

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

package/src/components/XdCityLocation/XdCityLocation.vue

@@ -77,13 +77,13 @@
         //微信参数
         isWx: false,
         time: 0,
-        
+
         location: {},
         baiduCount: 0, //baidu  API 加载次数
         backed: false,
         initBaidu: false,
         uiBaiduAk: '',
-        
+
         failStatus: false,
         timeStatus: null,
         permanentSave: 'xd-user-permanent-location-config',
@@ -92,7 +92,7 @@
       }
     },
     created() {
-      
+
       //#ifdef H5
       //微信环境定位
       if(isWechat()) {
@@ -100,7 +100,7 @@
         this.init();
         return
       }
-      
+
       //百度定位
       this.uiBaiduAk = this.baiduAk || this.$settings.baiduAk;
       if(this.baidu){
@@ -112,7 +112,7 @@
           this.init();
         }
       }
-      
+
       //默认
       else{
         this.init();
@@ -127,11 +127,11 @@
     methods:{
       ...mapMutations(['setLocationInfo']),
       ...mapActions(['getH5WxAuthorize']),
-  
+
       getLocationData(){
         return storage.get(this.locationStorageKey);
       },
-  
+
       /**
        * @description 火星转百度坐标
        * @param lng
@@ -143,7 +143,7 @@
         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);
@@ -152,7 +152,7 @@
         let bd_lat = z * Math.sin(theta) + 0.006;
         return {longitude: bd_lng, latitude:bd_lat}
       },
-      
+
       wxLocation(){
         //被拒绝之后不在启动授权功能
         if(storage.get(this.rejectSave) === true) {
@@ -164,12 +164,12 @@
           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')
@@ -181,7 +181,10 @@
               this.handleBaiduInit(null);
               return
             }
-            
+
+            let time = null;
+            let isReturn = false;
+
             //手机端微信环境
             jwxSDK.getLocation({
               type: 'gcj02',
@@ -199,9 +202,23 @@
                 this.handleBaiduInit(this.location);
               },
               fail: (e) => {
+
+                //已超时返回
+                if(isReturn) {
+                  time = null;
+                  return;
+                }
+
+                //比超时返回快
+                if(time) {
+                  clearTimeout(time);
+                  time=null;
+                }
+
                 this.$xdLog.setProject('Location.wx.api.fail', {
                   lng: null,
-                  lat: null
+                  lat: null,
+                  error:e
                 });
                 this.handleBaiduInit(null)
               },
@@ -214,6 +231,17 @@
                 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;
+            }, 5000)
           })
           .catch(res => {
             this.$xdLog.setProject('Location.wx.jwxSDK.fail', {
@@ -223,7 +251,7 @@
             this.handleBaiduInit(null)
           });
       },
-  
+
       /**
        * @description 主要针对百度定位超时进行返回操作
        */
@@ -236,7 +264,7 @@
           }, 10000)
         }
       },
-      
+
       init(){
         if(this.getLocationData() !== null){
           this.$xdLog.setProject('Location.cache', this.getLocationData());
@@ -252,7 +280,7 @@
           }
           return;
         }
-        
+
         //百度定位
         if(this.isWx === false) {
           // 没有定位信息并且超时5秒
@@ -263,7 +291,7 @@
 
       handleDone(){
         this.setLocationInfo(this.location);
-        
+
         //超过5秒就不走这里的逻辑
         if(this.failStatus === false) {
           this.$xdLog.setProject('Location.done', this.location);

package/src/components/XdDailog/XdDailog.vue

@@ -32,19 +32,17 @@
         </view>
         <view class="xd-dailog__body-btn" v-if="cancel || confirm">
           <slot name="btn">
-            <view>
+            <view v-if="cancel">
               <xd-button
-                v-if="cancel"
                 @click="handleConfirm('cancel')"
                 :type="cancelColorType"
                 size="medium"
                 :radius="btnRadius  + 'rpx'"
               >{{cancelText}}</xd-button>
             </view>
-            <view>
+            <view v-if="confirm">
               <xd-button
                 @click="handleConfirm('confirm')"
-                v-if="confirm"
                 :type="confirmColorType"
                 size="medium"
                 :radius="btnRadius + 'rpx'"
@@ -135,7 +133,7 @@
         type: Number, //rpx
         default: 10,
       },
-      
+
       isAuto:{
         type: Boolean,
         default: false,
@@ -167,7 +165,7 @@
       if(this.$configProject && this.$configProject.isPreview) {
         this.isPreview = !this.isAuto && this.$configProject.isPreview
       }
-      
+
     },
     methods: {
 

package/src/components/XdTab/XdTab.vue

@@ -19,7 +19,7 @@
           :id="`tab-scroll__index-${index}`"
           v-for="(item, index) in list"
           :key="index"
-          :style="{color: activeIndex === index? styleMainColor: color}"
+          :style="{color: activeIndex === index? activeColor || styleMainColor: color}"
           class="tab-scroll__item"
           :class="{active:activeIndex === index}"
 				  @click="clickTab(item, index)"
@@ -32,7 +32,7 @@
           <view
 						v-if="showFooterLine"
 						:style="{
-							background: activeIndex === index? styleMainColor: '',
+							background: activeIndex === index? activeColor || styleMainColor: '',
 							bottom: (lineBottom) + 'rpx'
 						}"
 					></view>
@@ -103,6 +103,10 @@
         type: String,
         default: '#333'
       },
+      activeColor:{
+        type: String,
+        default: ''
+      },
       bgColor: {
         type: String,
         default: '#fff'
@@ -143,7 +147,7 @@
     async created() {
       this.styleMainColor = await getParentsStyle(this.$parent, '$mainColor');
 		},
-		
+
     mounted(){
 	    this.$nextTick(()=>{
         this.toView = 'tab-scroll__index-0'
@@ -208,7 +212,7 @@
 					display: flex;
 					align-items: center;
 					align-content: center;
-					
+
 					&.active {
 						color: @xd-base-color;
 					}

package/src/utils/xd.base.js

@@ -655,19 +655,23 @@ export function toProductDetail($vm, item, url, showCart = false) {
 
 /**
  * @description 获取图片信息
- * @param src {String} 图片地址
- * @param height {Number} 默认高度
+ * @param src {string} 图片地址
+ * @param height {number} 默认高度
+ * @param margin {number} 像素
  */
-export function getImageInfo(src, height = 100) {
+export function getImageInfo(src, height = 100, margin = 0) {
   return new Promise((resolve, reject) => {
     uni.getImageInfo({
       src,
       complete:(image)=>{
-        console.log('getImageInfo', image)
         if(image.errMsg === 'getImageInfo:ok') {
+          const system = uni.getSystemInfoSync()
+          const windowW = system.safeArea.width - Number(margin);
+          const windowH = Math.floor((image.height * windowW)/image.width);
+          console.log('getImageInfo', image,windowH)
           resolve({
-            imgWidth: image.width,
-            imgHeight: image.height,
+            imgWidth: windowW,
+            imgHeight: windowH,
             imgStatus: 'ok'
           });
         }