gxd-uni-library-editx 1.0.22 → 1.0.23

package/package.json

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

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'
           });
         }