jufubao-mall 2.0.20-beta12 → 2.0.20-beta14

package/package.json

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

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -725,7 +725,7 @@
         }
         this.titleRadius = gCPVal(container, 'titleRadius', [defTitleRadius,this.gStyleValue.radius,'0'],{sKey: 'titleRadiusStatus', fields: ['titleRadius']})||0;
         this.titlePadding = gCPVal(container, 'titlePadding', 0,{sKey: 'titlePaddingStatus', fields: ['titlePadding']});
-        this.titleSp = gCPVal(container, 'titleSp', [(this.layout === 'v2'?0:48), 0],{sKey: 'titleSpStatus', fields: ['titleSp']});
+        this.titleSp = gCPVal(container, 'titleSp', [(this.layout === 'v2'?0:48), 20],{sKey: 'titleSpStatus', fields: ['titleSp']});
 
         //内容
         this.contentBgc = gCPVal(container, 'contentBgc', '#fff',{sKey: 'contentBgcStatus', fields: ['contentBgc']} );

package/src/components/JfbMallBrandWall/cusAttr/tab.js

@@ -134,7 +134,7 @@ export default (datas, gValue, gColor, oldData={})=>{
       groupKey: 'style',
       ele: 'xd-slider',
       valueKey: "titleSp",
-      value:  dataVal({data, key:'titleSp', dValue:gValue.isFirst && gValue.isAdd?(data.layout === 'v2'?0:48):0}),
+      value:  dataVal({data, key:'titleSp', dValue:gValue.isFirst && gValue.isAdd?(data.layout === 'v2'?0:48):20}),
       hidden: !statusShow({data, key: 'titleSpStatus', fields:['titleSp'], gValue}),
       className: "input100",
       labelInline: true,

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -547,7 +547,13 @@
           if(this.stateCity.city_code) data['city_code'] = this.stateCity.city_code
         }
         if(this.brand_type === 'code') data['product_types'] = 'card';
-        if(this.trueCateId  || this.truePid)  data['custom_category_id'] = this.trueCateId  || this.truePid;
+        if(this.trueCateId  || this.truePid) 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);
+        }
+
         return data;
       },
 

package/src/components/JfbMallProductList/XdCateV2.vue

@@ -339,7 +339,7 @@ export default {
           background: #EEEEEE;
           font-size: 24rpx;
           font-weight: 400;
-          color: #999999;
+          color: #666;
           border-radius: 80rpx;
           min-width: 128rpx;
           text-align: center;
@@ -441,7 +441,7 @@ export default {
       border-radius: 32rpx;
       background: #f7f7f7;
       box-sizing: border-box;
-      color: #999;
+      color: #666;
       font-size: 24rpx;
       padding: 0 16rpx;
       font-weight: 400;

package/src/components/JfbMallProductList/cateMixins.js

@@ -65,8 +65,12 @@ export default {
     },
 
     borderComp(){
+      let border = 0;
+      if(typeof this.tabStyle['subTitleIconBorder'] === 'string' && this.tabStyle['subTitleIconBorder']) {
+        border =  (parseInt(this.tabStyle['subTitleIconBorder'].split(' ')[0]) * this.$rpxNum) + 'px'
+      }
       return {
-        '--sub-icon-border' : (parseInt(this.tabStyle['subTitleIconBorder'].split(' ')[0]) * this.$rpxNum) + 'px',
+        '--sub-icon-border' : border,
         '--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,
@@ -76,15 +80,17 @@ export default {
     subTitleIcon(){
       let style = {  borderRadius: this.tabStyle['subTitleRadius']}
       if(this.showType === 'parentNew') {
-        let num = this.tabStyle['subTitleIconBorder'].split(' ')[0];
-        style['border'] = `${num} solid rgba(255,255,255,0.01)`;
+        let border = 0;
+        if(typeof this.tabStyle['subTitleIconBorder'] === 'string' && this.tabStyle['subTitleIconBorder']) {
+          border = this.tabStyle['subTitleIconBorder'].split(' ')[0];
+        }
+        style['border'] = `${border} solid rgba(255,255,255,0.01)`;
       }
       return style
     },
     subActTitleIcon(){
       let style = {  borderRadius: this.tabStyle['subTitleRadius']}
       if(this.showType === 'parentNew') {
-        let num = this.tabStyle['subTitleIconBorder'].split(' ')[0];
         style['border'] = this.tabStyle['subTitleIconBorder'];
       }
       return style