jufubao-mall 2.0.20-beta1 → 2.0.20-beta11

package/package.json

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

package/src/components/CusProduct/CusProduct.vue

@@ -207,7 +207,6 @@ export default {
 
 <style scoped lang="less">
   .product {
-    cursor: pointer;
 
     &.one {
       display: flex;

package/src/components/JfbMallBrandHome/JfbMallBrandHome.vue

@@ -805,7 +805,7 @@
         jfbRootExec("getBrandHomeInfo", {
           vm: this,
           data: {
-            ...this.options,
+            //...this.options,
             brand_id: this.brand_id,
             xnamespace: this.xnamespace
           }
@@ -910,20 +910,24 @@
             page_size = this.show_shop_num;
           }
         }
+        let data = this.$xdUniHelper.deleteParamEmptyKey({
+          consume_mode: "SELL",
+          ...this.options,
+          brand_id: this.brand_id,
+          city_code: this.stateCity.city_code,
+          latitude: this.stateLocation.latitude,
+          longitude: this.stateLocation.longitude,
+          page_size:  page_size,
+          page_token: this.shop_page_token,
+          region_limit_tpl_id: this.region_limit_tpl_id,
+          namespace: this.xnamespace,
+        });
+
+        if(data['brand_type']) delete data['brand_type'];
+
         jfbRootExec("getMallBrandHomeShopList", {
           vm: this,
-          data: this.$xdUniHelper.deleteParamEmptyKey({
-            consume_mode: "SELL",
-            ...this.options,
-            brand_id: this.brand_id,
-            city_code: this.stateCity.city_code,
-            latitude: this.stateLocation.latitude,
-            longitude: this.stateLocation.longitude,
-            page_size:  page_size,
-            page_token: this.shop_page_token,
-            region_limit_tpl_id: this.region_limit_tpl_id,
-            namespace: this.xnamespace,
-          })
+          data: data
         }).then(res => {
           this.loaded = true;
           let list = res.list.map(item=>{
@@ -1284,7 +1288,7 @@
         background:#fff;
         padding: 32rpx 40rpx 40rpx 40rpx;
         border-radius: 8rpx;
-        margin-bottom: 20rpx; 
+        margin-bottom: 20rpx;
       }
       &_brand_info {
         position: relative;
@@ -1374,7 +1378,7 @@
         }
       }
     }
-      
+
     }
   }
 </style>

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -22,12 +22,13 @@
           <scroll-view
             :scroll-x="layout==='v1'"
             :scroll-y="layout==='v2'"
-            :style="{height:layout==='v2'?tabStyleComp.height:'auto'}"
+            :style="{height:layout==='v2'? tabStyleComp.height:'auto'}"
             :class="{'tab-linex':layout==='v1' && hStyle ==='v3'}"
           >
             <view
               class="tab_list"
               :class="{hStyle: layout === 'v1'}"
+              :style="[tabListComp]"
               v-if="loaded"
             >
               <view
@@ -46,7 +47,7 @@
                   || (layout === 'v1' && ['v2','v3'].includes(hStyle))"
                   class="lineCom"
                   :class="{lineSmall: ['v3'].includes(hStyle)}"
-                  :style="{backgroundColor: i === tabIndex?tabActItemStyleComp.color:'rgba(0,0,0,0)'}"
+                  :style="{backgroundColor: i === tabIndex?tabActItemNameStyle.color:'rgba(0,0,0,0)'}"
                 ></view>
                 <view :style="[i === tabIndex?tabActItemNameStyle:tabItemNameStyle]">{{tab.input}}</view>
               </view>
@@ -91,7 +92,11 @@
                 <template v-if="brand.isEmpty === undefined">
                   <view
                     class="brand_icon"
-                    :class="[brandIconClass]"
+                    :class="{
+                      'brand_icon3': (layout === 'v1' && contentCell===3) || layout === 'v2',
+                      'brand_icon4': layout === 'v1' && contentCell===4,
+                      'brand_icon5': layout === 'v1' && contentCell===5 ,
+                    }"
                     :style="[brandItemIconStyle]
                 ">
                     <image v-if="brand.status===true" @error="brand.status = false" :src="brand.brand_icon" mode="aspectFill"></image>
@@ -199,14 +204,15 @@
 
         //选项卡信息
         titleBgc: '',
-        tabPadding:{},
+        tabPadding:{},//选项卡填充
         titleStyle:{},
         titleRadius:0,
         titleShadow:'',
         titleBorder:0,
         titleBorderWidth:0,
         titleBgcActColor:'',
-        titlePadding: 0,
+        titlePadding: 0, //内容与选项卡填充
+        titleSp: 0, //选项卡间距
 
 
         //内容
@@ -245,7 +251,7 @@
       skeletonStyle(){
         let margin = 0;
         if(this.layout === 'v1') {
-           margin = '24rpx 24rpx 24rpx 0';
+           margin = '0rpx 24rpx 0rpx 0';
         }
         if(this.layout === 'v2') {
           margin = '12rpx'
@@ -263,7 +269,10 @@
         }
       },
       showTabs(){
-        let tabs = this.$xdUniHelper.cloneDeep(this.newLabel).filter(item=>item.check);
+        let tabs = this.$xdUniHelper.cloneDeep(this.newLabel).filter(item=>{
+          return item.check === true
+        });
+
         //线下签是否展示通过后台控制
         if(this.has_sell) return tabs;
         else return tabs.filter(item => item.value !== 'sell');
@@ -276,7 +285,6 @@
           outWdith += 172;
           if(this.titleBorderWidth) outWdith += this.titleBorderWidth * 2;
           if(this.titleBorderWidth === 0 && this.vStyle === 'v1') outWdith +=2
-          outWdith += this.getPMValue(this.tabPadding, 'RL', 0);
         }
         outWdith += this.getPMValue(this.listMargin, 'RL',0);
         outWdith += this.getPMValue(this.listPadding, 'RL',0);
@@ -291,12 +299,6 @@
           marginTop: this.bindSize + 'rpx'
         }
       },
-      brandIconClass(){
-        let cssName = {};
-        if(this.layout === 'v1') cssName = {brand_icon3: this.contentCell === 3,brand_icon4: this.contentCell === 4,brand_icon5: this.contentCell === 5};
-        if(this.layout === 'v2') cssName = {brand_icon5: true}
-        return cssName
-      },
       brandItemIconStyle(){
         return {
           width: this.getItemWH,
@@ -351,9 +353,6 @@
           if(['v1', 'v2'].includes(this.vStyle)) {
             style['height'] = `${this.layoutInfo.bodyMinHeightPx - outHeight}px`;
           }
-          // if(['v2', 'v4'].includes(this.vStyle)) {
-          //   style['max-height'] = `${this.layoutInfo.bodyMinHeightPx - outHeight}px`;
-          // }
           style['overflowY'] = 'auto';
           style['overflowX'] = 'hidden';
         }
@@ -366,7 +365,7 @@
         let style = {}
         //上下结构
         if(this.layout === 'v1') {
-          style['padding'] = this.getMarginAndPadding(this.tabPadding, 0);
+
           if(!this.isPreview) {
             style['position'] = 'fixed';
             style['zIndex'] = '10';
@@ -380,26 +379,60 @@
           style['width'] = '172rpx';
           style['flexShrink'] = 0;
           style['overflow'] = 'hidden';
-          style['padding'] = this.getMarginAndPadding(this.tabPadding, 0);
+          style['padding'] = 0;
 
           if(['v1', 'v2'].includes(this.vStyle)) {
             let tb = this.getPMValue(this.bodyPadding, 'TB', 0) * this.$rpxNum +  this.titleBorderWidth * 2 *this.$rpxNum;
-            tb +=  this.getPMValue(this.tabPadding, 'TB', 0) * this.$rpxNum
             style['height'] = `calc(${ this.layoutInfo.bodyMinHeightPx}px - ${tb}px)`;
             style['borderRadius'] = `0 ${this.titleRadius}rpx  ${this.titleRadius}rpx  0`;
           }
         }
         return style;
       },
+      tabListComp(){
+        let temp = {};
+        if(['v1','v2'].includes(this.layout)) {
+          temp['paddingLeft'] =  (this.tabPadding.left || 0) + 'rpx';
+          temp['paddingRight'] =  (this.tabPadding.right || 0) + 'rpx';
+          temp['paddingBottom'] =  (this.tabPadding.bottom || 0) + 'rpx';
+          temp['paddingTop'] =  (this.tabPadding.top || 0) + 'rpx';
+        }
+        return temp
+      },
       tabStyleComp(){
+        let border = {};
+        if(this.layout === 'v2') border = {border: this.titleBorder}
+        else border = {borderBottom: this.titleBorder}
         return {
           boxShadow: this.titleShadow,
-          borderBottom: this.titleBorder,
+          ...border,
           backgroundColor: this.titleBgc,
-          marginBottom: this.titlePadding + 'rpx',
+          //在模版二不使用内容与选项卡直接间距
+          marginBottom: this.layout === 'v2'?0:this.titlePadding + 'rpx',
           ...this.getTabHeight,
         };
       },
+      getTabItemHeight(){
+        if(this.layout === 'v1'){
+          return  {
+            height: '60rpx',
+            lineHeight:'60rpx',
+            marginRight: this.titleSp + 'rpx',
+            minWidth: '80rpx'
+          }
+        }
+
+        if(this.layout === 'v2'){
+          return {
+            height: '100rpx',
+            lineHeight: '100rpx',
+            borderRadius:'0',
+            fontSize:'24rpx',
+            marginBottom: this.titleSp + 'rpx'
+          }
+        }
+
+      },
       tabItemStyleComp(){
         let style = {
           color: this.titleStyle.color,
@@ -418,34 +451,12 @@
         }
         return style
       },
-      getTabItemHeight(){
-        if(this.layout === 'v1'){
-          return  {
-            height:['v1'].includes(this.hStyle) ?'60rpx' : '108rpx',
-            lineHeight: ['v1'].includes(this.hStyle) ?'60rpx' : '108rpx',
-            marginRight: this.titleSp + 'rpx',
-          }
-        }
-
-        if(this.layout === 'v2'){
-          return {
-            height: '100rpx',
-            lineHeight: '100rpx',
-            borderRadius:'0',
-            fontSize:'24rpx',
-            marginBottom: this.titlePadding + 'rpx'
-          }
-        }
-
-      },
-
       tabActItemStyleComp(){
         let style = {
           color: this.titleStyle.actColor,
           fontWeight: this.titleStyle.actFontWeight,
         };
         if(this.layout === 'v2') {
-          style['fontSize'] = '24rpx';
           style = {...style,...this.getTabItemHeight}
           if(['v2'].includes(this.vStyle)) {
             if(this.titleStyle.actBgColor) style['backgroundColor'] = this.titleStyle.actBgColor;
@@ -463,22 +474,54 @@
         }
         return style
       },
+
       tabItemNameStyle(){
-        if(this.layout === 'v2') return {}
+        if(this.layout === 'v2') return {
+          fontSize: parseInt(this.titleStyle.fontSize) + 'rpx',
+          fontWeight: this.titleStyle.fontWeight,
+          color: this.titleStyle.color,
+        }
         return {
           borderRadius:['v1'].includes(this.hStyle)?'60rpx': 0,
           backgroundColor: ['v1'].includes(this.hStyle) ? this.titleStyle.bgColor:'',
           color: this.titleStyle.color,
           padding:'0 32rpx',
-          fontSize: this.titleStyle.fontSize + 'rpx',
+          fontSize: parseInt(this.titleStyle.fontSize) + 'rpx',
           fontWeight: this.titleStyle.fontWeight,
         }
       },
       tabActItemNameStyle(){
-        if(this.layout === 'v2') return {}
         let bgColor = '';
         let bgImage = 'none';
+        let color = this.mainColor;
+        if(this.layout === 'v2') {
+          if(['v2'].includes(this.vStyle)) {
+            //选项卡标签文字颜色
+            if(this.titleStyle.actColor) color = this.titleStyle.actColor;
+            else color = '#fff';
+
+            //选项卡标签背景颜色
+            if(this.titleStyle.actBgColor) bgColor = this.titleStyle.actBgColor;
+            else {
+              if(this.mainGradient && this.mainGradient.indexOf('gradient') !== -1)  bgImage = this.mainGradient;
+              else bgColor = this.mainColor;
+            }
+          }
+
+          return {
+            backgroundColor: bgColor,
+            color: color,
+            fontSize: parseInt(this.titleStyle.actFontSize) + 'rpx',
+            fontWeight: this.titleStyle.actFontWeight,
+          }
+        }
+
         if(['v1'].includes(this.hStyle)) {
+          //选项卡标签文字颜色
+          if(this.titleStyle.actColor) color = this.titleStyle.actColor;
+          else color = '#fff';
+
+          //选项卡标签背景颜色
           if(this.titleStyle.actBgColor) bgColor = this.titleStyle.actBgColor;
           else {
             if(this.mainGradient && this.mainGradient.indexOf('gradient') !== -1)  bgImage = this.mainGradient;
@@ -490,8 +533,8 @@
           backgroundColor: bgColor,
           backgroundImage: bgImage,
           padding: '0 32rpx',
-          color: this.titleStyle.actColor,
-          fontSize: this.titleStyle.actFontSize + 'rpx',
+          color: color,
+          fontSize:  parseInt(this.titleStyle.actFontSize) + 'rpx',
           fontWeight: this.titleStyle.actFontWeight,
         }
       },
@@ -514,9 +557,6 @@
       this.$nextTick()
     },
     methods: {
-      tr() {
-        return tr
-      },
       onJfbLoad(options) {
         //设置业务请求代码
         this.setNameSpace(options);
@@ -562,7 +602,8 @@
         ]
         let newLabel = this.$xdUniHelper.cloneDeep(gCPVal(container, 'newLabel', []))
           .filter(item=>{
-            return item['isShow'] !== undefined
+            //更古老数据，相对新数据
+            return item['isShow'] === undefined || item['isShow'] === true
           })
           .sort((a,b)=>Number(a.sort)-Number(b.sort))
           .map(item=>{
@@ -572,6 +613,7 @@
               item['check'] = item['isShow'];
               delete item['isShow'];
             }
+            else item['check'] = true;
             if(item['newLabel'] !== undefined || item['label'] !== undefined) {
               item['input'] = item['newLabel'] || item['label'];
               delete item['newLabel'];
@@ -579,8 +621,20 @@
             }
             return item
           });
-        this.newLabel = gCPVal(container, 'tabContent', [newLabel.length > 0 ? newLabel: defNewLabel]);
+        let defValues = {
+          all: '全部',
+          sell:'线下',
+          code:'电子码',
+          stod:'线上',
+          'stod-samecity':'同城配送',
+          "stod-logistics":'快递配送',
+          'stod-takeout':'门店自提'
+        }
 
+        this.newLabel = gCPVal(container, 'tabContent', newLabel.length > 0 ? newLabel: defNewLabel).map(item=>{
+          if(item.input === '') item.input = defValues[item.value];
+          return item
+        });
 
         //常规
         let defBodyPadding= 0;
@@ -616,12 +670,10 @@
           else defListPadding = {top:40,left:40, right:40, bottom:40};
         }
 
+        let defListMargin = 0;
+        if(this.layout === 'v2' && this.vStyle === 'v2') defListMargin = 24;
+
         this.listPadding = gCPVal(container, 'listPadding', [defListPadding,24], {sKey: 'listPaddingStatus', fields: ['listPadding'], isPMR: true});
-        let defListMargin= 0;
-        if(this.layout === 'v2'){
-          //if(['v3', 'v4'].includes(this.vStyle)) defListMargin = {top:0,left:24, right:0, bottom:0}
-          if(['v2'].includes(this.vStyle)) defListMargin = {top:24,left:24, right:24, bottom:24}
-        }
         this.listMargin = gCPVal(container, 'listMargin', [defListMargin,0], {sKey: 'listMarginStatus', fields: ['listMargin'], isPMR: true});
         this.contRadius = gCPVal(container, 'contRadius', [this.gStyleValue.radius,0],{sKey: 'contRadiusStatus', fields: ['contRadius']})||0;
 
@@ -631,18 +683,11 @@
         let defTabPadding = 0;
         let oldTabPadding = 0;
         if(this.layout === 'v2') {
-          if(['v2', 'v1'].includes(this.vStyle)) defTabPadding = {top:0,left:0, right:0, bottom:0};
           if(['v1'].includes(this.vStyle)) defTitleBgc = '#f8f8f8';
         }
         if(this.layout === 'v1') {
-          defTabPadding =  {top:0,left:32, right:0, bottom:0};
-          oldTabPadding = {top:0,left:32, right:0, bottom:0};
-
-          if(['v1'].includes(this.hStyle)) {
-            defTabPadding =  {top:24,left:32, right:0, bottom:24};
-            oldTabPadding = {top:24,left:32, right:0, bottom:24};
-          }
-
+          defTabPadding =  {top:24,left:32, right:32, bottom:24};
+          oldTabPadding = {top:40,left:40, right:40, bottom:40};
         }
         this.tabPadding = gCPVal(container, 'tabPadding', [defTabPadding,oldTabPadding], {sKey: 'tabPaddingStatus', fields: ['tabPadding'], isPMR: true});
         this.titleBgc = gCPVal(container, 'titleBgc', [defTitleBgc,'#fff'],{sKey: 'titleBgcStatus', fields: ['titleBgc']});
@@ -653,7 +698,7 @@
         let titleStyleStatus =  gCPVal(container, 'titleStyleStatus', '');
         if(titleStyleStatus === 'D') titleActColor = '';
         let mainColor = titleActColor || this.mainColor;
-        if(this.layout === 'v1' && this.hStyle === 'v1')  mainColor = '#fff';
+        //if(this.layout === 'v1' && this.hStyle === 'v1')  mainColor = '#fff';
         if(this.layout === 'v2' && this.vStyle === 'v2')  mainColor = '#fff';
         this.titleStyle = gCPVal(
           container,
@@ -661,16 +706,16 @@
           [{
             color: titleColor || '#333',
             bgColor: titleBgcColor || '#fff' ,
-            fontSize: '32',
+            fontSize: this.layout === 'v2' ?'24':'32',
             fontWeight: '400',
-            actColor: mainColor,
-            actFontWeight: '400',
-            actFontSize: '32',
-            actBgColor: "",
+            actColor: titleActColor || '',
+            actFontWeight: '500',
+            actFontSize: this.layout === 'v2' ?'24':'32',
+            actBgColor:this.titleBgcActColor || '',
           }],
           {sKey:'titleStyleStatus',fields:['titleStyle'],isMerge: true},
         );
-        this.titleShadow = gCPVal(container, 'titleShadow', [this.gStyleValue.shadow,'none'], {isShadow:true, bsOld:['isTitleShadow','isTitleShadowBgcW','isTitleShadowBgc']});
+        this.titleShadow = gCPVal(container, 'titleShadow', [this.gStyleValue.shadow , 'none'], {isShadow:true, bsOld:['isTitleShadow','isTitleShadowBgcW','isTitleShadowBgc']});
         this.titleBorder = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
         this.titleBorderWidth = gCPVal(container, 'titleBorder', [{color: '#eee', width: '0', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true,isBsWidth: true, bsOld:['isTitleBorder','isTitleBorderW','isTitleBorderColor']});
 
@@ -679,16 +724,16 @@
           if(['v1','v2'].includes(this.vStyle)) defTitleRadius = '0';
         }
         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', [48, 0],{sKey: 'titleSpStatus', fields: ['titleSp']});
+        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.contentBgc = gCPVal(container, 'contentBgc', '#fff',{sKey: 'contentBgcStatus', fields: ['contentBgc']} );
         let contentPadding = gCPVal(container, 'contentPadding',''), bindSize = 68;
         if(this.layout === 'v1' && this.contentCell === 3) bindSize = 28;
         if(this.layout === 'v1' && this.contentCell === 5) bindSize = 60;
-        if(contentPadding) bindSize = 100 - Number(contentPadding);
-        this.bindSize = 100 - Number(gCPVal(container, 'bindSize', [bindSize,68],{sKey: 'bindSizeStatus', fields: ['bindSize']}));
+        if(contentPadding) bindSize = 112 - Number(contentPadding);
+        this.bindSize = 112 - Number(gCPVal(container, 'bindSize', [bindSize,68],{sKey: 'bindSizeStatus', fields: ['bindSize']}));
         this.radius = gCPVal(container, 'radius', [this.gStyleValue.radius,0],{sKey: 'radiusStatus', fields: ['radius']})||0;
         this.brandShadow = gCPVal(container, 'brandShadow', [this.gStyleValue.shadow,'none'], {isShadow:true, bsOld:['isContShadow','isContShadowBgcW','isContShadowBgc']});
         this.brandBorder = gCPVal(container, 'brandBorder', [{color: '#f8f8f8', width: '2', style: 'solid'},{color: '#eee', width: '0', style: 'solid'}], {isBorder:true, bsOld:['isContBorder','isContBorderW','isContBorderColor']});
@@ -696,8 +741,8 @@
           container,
           "brandStyle",
           [{
-            color: gCPVal(container, 'brandNameColor', '') || '#333',
-            fontSize: '24',
+            color: gCPVal(container, 'brandNameColor', '') || '#666',
+            fontSize: '28rpx',
             fontWeight: '400',
           }],
           {sKey:'brandStyleStatus',fields:['brandStyle'],isMerge: true},
@@ -730,8 +775,10 @@
 
       switchTab(i){
         this.tabIndex = i;
+        this.brandList = null
         this.getList();
       },
+
       getList(){
         this.$xdShowLoading({});
         let params = {
@@ -742,9 +789,9 @@
         if(this.isCityFilter === "Y") params['city_code'] = this.stateCity.city_code;
         else params['city_code'] = '';
         if(this.category_ids && this.category_ids.length > 0) params['category_ids'] = this.category_ids.join(",");
+
         jfbRootExec("getNewBrandWallList", {vm: this,data: params}).then(res => {
           this.$xdHideLoading();
-
           let brandList = res.items.map(item => {
             item['brand_icon'] = item.brand_icon ? getServiceUrl(item.brand_icon, "size2") : "";
             item['status'] = true;
@@ -753,7 +800,10 @@
 
           //补缺
           if(brandList.length >0) {
-            let differences = this.contentCell -  brandList.length % this.contentCell;
+            let differences = 0;
+            if( brandList.length % this.contentCell  > 0) {
+              differences = this.contentCell -  brandList.length % this.contentCell
+            }
             for(let i =0; i < differences; i++) {
               brandList.push({isEmpty: true});
             }
@@ -772,6 +822,7 @@
           })
         })
       },
+
       toBrand(brand){
         if(this.isPreview) return;
         let { params , brand_id} = brand;
@@ -856,7 +907,7 @@
                   left: 50%;
                   width: 64rpx;
                   transform: translateX(-50%);
-                  bottom: 16rpx;
+                  bottom: -16rpx;
                   height: 6rpx;
                   border-radius: 4rpx;
                 }

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

@@ -55,13 +55,13 @@ export default (data, gValue, gColor, oldData)=>{
       groupKey: 'style',
       ele: 'xd-slider',
       valueKey: "bindSize",
-      value: dataVal({data, key:'bindSize', dValue: gValue.isAdd && gValue.isFirst?bindSize: 68, gValue}),
+      value: dataVal({data, key:'bindSize', dValue: gValue.isAdd && gValue.isFirst ? bindSize: 68, gValue}),
       hidden: !statusShow({data, key: 'bindSizeStatus', fields:['bindSize'], gValue}),
       className: "input100",
       labelInline: true,
       setting:{
-        min: 0,//最小值
-        max: 100, //最小值
+        min: 50,//最小值
+        max: 90, //最小值
         step:1, //步长
         showStops:false,//显示间断点
         showInput:false,//显示输入框
@@ -97,7 +97,7 @@ export default (data, gValue, gColor, oldData)=>{
         selected:false,
         default:{
           color: data['brandNameColor'] || '#666',
-          fontSize:'24',
+          fontSize:'28rpx',
           fontWeight: '400'
         },
       },

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

@@ -10,8 +10,10 @@ export default (data, gValue, gColor, oldData={})=>{
   //老数据
   let tabContent = [];
   if(data['newLabel'] !== undefined) {
-    let newLabel = clone(data['newLabel']).filter(item=>{
-      return item['isShow'] !== undefined
+    let newLabel = clone(data['newLabel']).map(item=>{
+      if(typeof item.isShow === 'boolean') item.check = item.isShow;
+      else  item.check = true;
+      return item
     });
     tabContent = newLabel.sort((a,b)=>Number(a.sort)-Number(b.sort)).map(item=>{
       item['placeholder'] = '自定义名称';
@@ -86,13 +88,13 @@ export default (data, gValue, gColor, oldData={})=>{
       inline: false,
       handleCustom({action, data}) {
         data.cb([
-          {value:'all', label: '全部',input:'',check: true,placeholder:'自定义名称'},
-          {value:'sell', label: '线下',input:'',check: true, placeholder:'自定义名称'},
-          {value:'code', label: '电子码',input:'',check: true,placeholder:'自定义名称'},
-          {value:'stod', label: '线上',input:'',check: true,placeholder:'自定义名称'},
-          {value:'stod-samecity', label: '同城配送',input:'',check: false,placeholder:'自定义名称'},
-          {value:'stod-logistics', label: '快递配送',input:'',check: false,placeholder:'自定义名称'},
-          {value:'stod-takeout', label: '门店自提',input:'',check: false,placeholder:'自定义名称'},
+          {value:'all', label: '全部',input:'', def: '全部', check: true,placeholder:'自定义名称'},
+          {value:'sell', label: '线下',input:'', def: '线下',check: true, placeholder:'自定义名称'},
+          {value:'code', label: '电子码',input:'', def: '电子码',check: true,placeholder:'自定义名称'},
+          {value:'stod', label: '线上',input:'', def: '线上',check: true,placeholder:'自定义名称'},
+          {value:'stod-samecity', label: '同城配送',input:'', def: '同城配送',check: false,placeholder:'自定义名称'},
+          {value:'stod-logistics', label: '快递配送',input:'', def: '快递配送',check: false,placeholder:'自定义名称'},
+          {value:'stod-takeout', label: '门店自提',input:'', def: '门店自提',check: false,placeholder:'自定义名称'},
         ])
       },
     },
@@ -146,7 +148,7 @@ export default (data, gValue, gColor, oldData={})=>{
       value: dataVal({data, key:'layout', dValue:'v1', gValue}),
       multiple: false,
       groupKey: 'content',
-      className: 'input50',
+      className: 'input100',
       labelInline:true,
       list: [
         {label: '上下布局', value: 'v1'},
@@ -211,7 +213,7 @@ export default (data, gValue, gColor, oldData={})=>{
       placeholder: '请选择显示列',
       multiple: false,
       groupKey: 'content',
-      className: 'input50',
+      className: 'input100',
       labelInline:true,
       hidden: !(['v1'].includes(dataVal({data, key:'layout', dValue:'v2', gValue}) )),
       list: [