gxd-uni-library-editx 1.0.148 → 1.0.150

package/package.json

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

package/src/components/XdUnit/XdUnit.vue

@@ -2,16 +2,19 @@
   <view
     class="xd-unit"
     :style="{height: fontSize *1.5 + 'rpx'}"
-    :class="{'xd-unit__show': !(uiIcon && isShowIcon)}"
+    :class="{'xd-unit__show': !(uiIcon && showIcon)}"
     v-if="show"
   >
-    <view class="xd-unit__price" :style="[priceStyleComp]">{{uiPrice}}</view>
+    <view class="xd-unit__price" :style="[priceStyleComp]">
+      <view v-if="showRMB">￥</view>
+      {{uiPrice}}
+    </view>
     <view v-if="range" :style="[rangeStyleComp]">{{range}}</view>
-    <view class="xd-unit__image" v-if="uiIcon && isShowIcon && (unit === null)">
+    <view class="xd-unit__image" v-if="uiIcon && showIcon && (unit === null)">
       <xd-image :is-gray="isGray" :src="uiIcon" :size="iconSize || iocnSize"></xd-image>
     </view>
     <template v-else>
-      <template v-if="unit !== null">
+      <template v-if="unit">
         <view
           class="xd-unit__unit"
           :style=" {
@@ -19,7 +22,9 @@
             fontSize: unitFontSize > 0 ? (unitFontSize + 'rpx') :(fontSize - 8) + 'rpx',
             color: isGray?'#999':uiColor
           }"
-          v-if="unit">{{unit}}</view>
+          v-if="unit">
+          {{unit}}
+        </view>
         <view v-else>
           <xd-coins :size="iconSize || iocnSize"></xd-coins>
         </view>
@@ -70,8 +75,8 @@
       },
 
       isShowIcon: {
-        type: Boolean,
-        default: true,
+        type: Boolean|String,
+        default: '',
       },
       price: {
         type: String | Number,
@@ -122,7 +127,7 @@
 
     },
     computed: {
-      ...mapState(['webUnitIcon','brandInfo']),
+      ...mapState(['webUnitIcon','brandInfo','siteInfo']),
 
       rangeStyleComp(){
         let size =  this.fontSize*(1/2) < 20?20:this.fontSize*(1/2);
@@ -150,7 +155,9 @@
         uiIcon: null, //金额显示icon
         uiPrice: null, //金额
         show: false,
-        fixedNum: null
+        fixedNum: null,
+        showIcon: true,
+        showRMB: false
       }
     },
     watch:{
@@ -164,7 +171,6 @@
     async created() {
 
 
-
       //配置中获取
       let optionsIcon = null;
       if (this.webSetting['unitIcon']) {
@@ -205,6 +211,17 @@
       if(this.unit === null) {
         this.uiIcon = projectIcon || brandIncon || optionsIcon;
       }
+     
+      if(this.siteInfo&&this.siteInfo.mapping&&this.siteInfo.mapping.coin_type&&this.siteInfo.mapping.coin_type==='rmb'){
+        this.showIcon = false;
+        this.showRMB = true;
+      } else {
+        this.showIcon = true;
+      }
+
+      if(typeof this.isShowIcon === 'boolean'){
+        this.showIcon = this.isShowIcon;
+      }
 
       //设置显示数字
       this.initPrice();
@@ -254,6 +271,11 @@
     &__price {
       margin-right: unit(12, rpx);
       font-weight: normal;
+      display: flex;
+      align-items: baseline;
+      & > view:first-child {
+        font-size: 24rpx;
+      }
     }
 
     &__image {

package/src/utils/helper.js

@@ -397,15 +397,15 @@ class Helpers {
     params = this.cloneDeep(params);
     let paramsStr = '';
     let count = 0;
-    this.forEach(params, (key) => {
-      if(count === 0) {
-        paramsStr = `${key}=${params[key]}`;
-      }
-      else{
-        paramsStr += `&${key}=${params[key]}`;
-      }
-      count++;
-    });
+    if (this.checkVarType(params) === 'array'
+      || this.checkVarType(params) === 'object'
+    ) {
+      Object.keys(params).map(key=>{
+        if(count === 0)  paramsStr = `${key}=${params[key]}`;
+        else paramsStr += `&${key}=${params[key]}`;
+        count++;
+      })
+    }
     return paramsStr;
   }