jufubao-mall 2.0.20-beta10 → 2.0.20-beta12

package/package.json

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

package/src/components/JfbMallProductList/ComFilterQuery.vue

@@ -443,7 +443,7 @@ export default {
     initMune() {
       let sortList = [];
       let allSortItems = [
-        {label: "综合",  value: "default", menuName: '综合推荐', key: 'common'},
+        {label: "综合",  value: "default", menuName: '综合', key: 'common'},
         {label: "销量",  value: "sale_num_desc", menuName: '销量', key: 'hot'},
         {label: "价格由高到低",  value: "price_desc", menuName: '价格降', key: 'price'},
         {label: "价格由低到高",  value: "price_asc", menuName: '价格升', key: 'price'},

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -519,6 +519,11 @@
           data['custom_category_id'] = this.trueCateId || this.truePid;
         }
 
+        //自定义父分类的时候，选择全部使用parentId的全部
+        if(Number(this.parentId) > 0) {
+          if(!data['custom_category_id']) data['custom_category_id'] = Number(this.parentId);
+        }
+
         //设置是否展示划线价格
         if(this.productConfig.isShowDiscount==='Y') data.is_show_uprice = this.$xdUniHelper.multiplyFloatNumber(this.productConfig.differ,100)
         else data.is_show_uprice = -1
@@ -816,9 +821,9 @@
         this.level2BgcColor = gCPVal(container, 'level2BgcColor', ['#fff','#f8f8f8'],{sKey:'level2BgcColorStatus', fields:['level2BgcColor']});
 
         let color = gCPVal(container, 'level2Color', '') || '#333',
-          actColoor= this.mainColor , bgColor='',bgActColor='';
+          actColor= this.mainColor , bgColor='',bgActColor='';
         if(categoryLayout1ShowType === 'parentNew') {
-          actColoor = '#fff';
+          actColor = '#fff';
           bgActColor = this.mainColor;
         }
 
@@ -826,7 +831,7 @@
           fontSize: '24',
           actFontSize: '24',
           color: color,
-          actColor:actColoor,
+          actColor:actColor,
           bgColor:bgColor,
           actBgColor:bgActColor,
           fontWeight: 'normal',
@@ -836,14 +841,13 @@
           fontSize: '24',
           actFontSize: '24',
           color: '#333',
-          actColor: this.mainColor,
-          bgColor:'',
-          actBgColor:'',
+          actColor: actColor,
+          bgColor:bgColor,
+          actBgColor:bgActColor,
           fontWeight: 'normal',
           actFontWeight: 'normal',
         }
         const level2Name = gCPVal(container, 'level2Name', [defNewLvel2Name,defOldLvel2Name],{sKey:'level2NameStatus', fields:['level2Name','level2Color'],isMerge: true});
-
         const subTitleRadius = gCPVal(container, 'subTitleRadius', ['40rpx'],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
         const subTitleIconShadow  = gCPVal(container, 'subTitleIconShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
         const subTitleIconBorder  = gCPVal(container, 'subTitleIconBorder', [{style:'solid', width: '2', color: this.mainColor},'0'], {isBorder:true});
@@ -1070,7 +1074,7 @@
               data: {
                 xnamespace: this.xnamespace,
                 root_category_id: Number(this.parentId),
-                level: 2,
+                level:['all','v2','parentNew'].includes(this.categoryLayout1ShowType)?2:1,
               }
             })
               .then(res => {

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -52,6 +52,7 @@
               <view
                 :style="[sub.category_id === (['child','parentNew'].includes(showType)? uiPid:uiCateId )?subActTitleIcon:subTitleIcon,subTitleInIcon]"
                 class="sub_icon"
+                :class="{parentNew: showType === 'parentNew'}"
               >
                 <view>
                   <image :src="sub.category_icon" style="width:100%;height:100%"/>
@@ -539,12 +540,14 @@ export default {
           justify-content: center;
           align-items: center;
           & > view {
-            background-color: #fff;
-            width: calc(100% - var(--sub-icon-border)*2);
-            height: calc(100% - var(--sub-icon-border)*2);
-            border: var(--sub-icon-border) solid #fff;
+            width: 100%;
+            height: 100%;
             border-radius: var(--sub-icon-w-radius);
             overflow: hidden;
+            box-sizing: border-box;
+          }
+          &.parentNew > view {
+            border: 2rpx solid #fff;
           }
         }
 

package/src/components/JfbMallProductList/cateMixins.js

@@ -67,7 +67,7 @@ export default {
     borderComp(){
       return {
         '--sub-icon-border' : (parseInt(this.tabStyle['subTitleIconBorder'].split(' ')[0]) * this.$rpxNum) + 'px',
-        '--sub-icon-w-radius': this.tabStyle['subTitleRadius'],
+        '--sub-icon-w-radius': parseInt(this.tabStyle['subTitleRadius']) * this.$rpxNum + 'px',
         '--sub-icon-right-sp': (this.tabStyle['iconImageSp'] || 16) * this.$rpxNum + 'px',
         backgroundColor: this.titleBgcColor,
       }