jufubao-mall 2.0.91 → 2.0.92-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.91",
+  "version": "2.0.92-beta1",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -154,6 +154,7 @@
                   :height="contProductImageHeight"
                   :cell="column_num"
                   :name-font="itemFontStyle"
+                  :price-font="itemPriceFontStyle"
                   :product-config="productConfig"
                   :isPlus="isGVipSite"
                   :item="item"
@@ -324,6 +325,7 @@
         imageRadius:'0',
         radius:'0',
         itemFontStyle:{},
+        itemPriceFontStyle:{},
         itemBgcColor:'',
         contBorder:'',
         contStyleBorder:0,
@@ -953,6 +955,14 @@
           gCPVal(container,'contStyle', {}, {sKey:'contStyleStatus',fields:['itemSpacing','contStyle']}),
           {fontSize: '28rpx', color: '#000', fontWeight: 'normal'},
         )
+        this.itemPriceFontStyle = this.getFontAndBgcStyle(
+          gCPVal(container,'priceFont', {}, {sKey:'priceFontStatus',fields:['priceFont']}),
+          {fontSize: '40', color: '', fontWeight: 'normal'},
+        )
+        //配置面板存储的fontSize带rpx后缀，此处去除避免下游重复拼接rpx导致单位无效
+        if (this.itemPriceFontStyle && this.itemPriceFontStyle.fontSize) {
+          this.itemPriceFontStyle.fontSize = String(this.itemPriceFontStyle.fontSize).replace('rpx', '');
+        }
 
         //商品样式关联属性
         const sValue = "{\"border\":0,\"backgroundColor\":\"#fff\"}";

package/src/components/JfbMallShop/ShowCard.vue

@@ -44,7 +44,7 @@
     </view>
     <view class="qrcode_choose" @click="handleChooseCard">
       <view class="qrcode_choose_name"><xd-font-icon style="margin-right: 24rpx;" size="32" icon="iconpiao"></xd-font-icon>{{card_name}}</view>
-      <view class="qrcode_choose_icon"><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
+      <view class="qrcode_choose_icon"><view>切换票券</view><xd-font-icon style="margin-left: 4rpx;" size="22" icon="iconxiangyou_xian"></xd-font-icon></view>
     </view>
     <xd-down-drawer
       :show.sync="showCardDialog"
@@ -267,10 +267,10 @@
         }).then(res => {
           this.showCardList = res.list;
 
-          //自动选择逻辑
-          let useCard = this.showCardList.filter(item => item.is_auto_use === 'Y');
-          if(useCard.length>0 && this.chooseData.length ===0) {
-            let ticket = useCard[0];
+          //自动选择逻辑：优先选择is_auto_use为Y的卡，否则选择第一张卡
+          if(this.chooseData.length === 0 && this.showCardList.length) {
+            let useCard = this.showCardList.filter(item => item.is_auto_use === 'Y');
+            let ticket = useCard.length > 0 ? useCard[0] : this.showCardList[0];
             this.handlerTicketSelect(!this.checkedCards.includes(ticket.card_number), ticket);
             setTimeout(() => {
               this.handleChooseConfirm()

package/get.package.path.js

@@ -1,22 +0,0 @@
-'use strict';
-
-/**
- * @description 第三方库
- * @param threePackagePath {String} 第三方库所在项目路径存放路径路
- * @param packname {String} 包名字
- * @returns {string|*}
- */
-const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
-  if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
-  }
-
-  if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
-  }
-
-};
-
-module.exports = {
-  getPackagePath
-}