jufubao-mall 2.0.20-beta4 → 2.0.20-beta5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.20-beta4",
+  "version": "2.0.20-beta5",
   "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/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -92,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>
@@ -296,12 +300,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,

package/src/components/JfbMallProductInfoV2/JfbMallProductInfoV2.vue

@@ -934,7 +934,7 @@
           flex: 1;
           justify-content: flex-end;
           .btn{
-            margin: 0 10rpx;
+            margin: 0 10rpx!important;
           }
         }
       }

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -607,6 +607,13 @@
 
         //==过滤区域============
         let categoryLayout = gCPVal(container, "categoryLayout", "v1");
+        let categoryLayout1ShowType = gCPVal(container, "categoryLayout1ShowType", "all");
+        let showCategory = gCPVal(container, 'showCategory', "Y");
+        //数据兼容处理
+        if(categoryLayout && categoryLayout === 'v1') {
+          if(categoryLayout1ShowType === 'child') categoryLayout = 'v3'
+        }
+        if(showCategory === 'N') categoryLayout = 'none';
         let category =  gCPVal(container, 'category',categoryLayout);
 
         //是否显示过滤菜单
@@ -618,7 +625,6 @@
         else this.isFilterMenuForFilterFields = [];
         //是否显示品牌菜单
         let showBrandFilter = gCPVal(container, "showBrandFilter", "in");
-        let filterModeSort = ['common','price','host','brand','delivery_method','filter'];
         //菜单设置
         let filterMode = [];
         if(showQuery === 'Y') {
@@ -700,9 +706,32 @@
         this.allIcon = gCPVal(container, "allIcon", {});
         this.allIconSize = 128 - Number(gCPVal(container, "iconWdith", 128));
 
+        //兼容数据
+
+
+
+        // //兼容分类操作
+        // let  category = 'v1';
+        // //老数据已设置
+        // if(data['categoryLayout']) {
+        //   category = data['categoryLayout'];
+        //   //设置v1项
+        //   if(data['categoryLayout'] === 'v1') {
+        //     if(data['categoryLayout1ShowType'] === 'child') {
+        //       category = 'v3';
+        //     }
+        //   }
+        // }
+        // //分类已设置隐藏（设置隐藏项）
+        // if(data['showCategory'] === 'N') {
+        //   category = 'none';
+        // }
+        // //新数据已设置值
+        // if(data['category'] !== undefined) {
+        //   category = data['category'] ;
+        // }
+
         //分类 - 功能设置
-        let showCategory = gCPVal(container, 'showCategory', "Y");
-        let categoryLayout1ShowType = gCPVal(container, "categoryLayout1ShowType", "all");
         if(category) {
           if(category === 'none'){
             showCategory = 'N';
@@ -802,7 +831,8 @@
         const subTitleIconBorder  = gCPVal(container, 'subTitleIconBorder', [{style:'solid', width: '2', color: this.mainColor},'0'], {isBorder:true});
         let navStyle = gCPVal(container, 'navStyle', 'line-6-8-s');
         if(navStyle.indexOf('line-') === 0) navStyle = 'line-6-8-s';
-        const iconWdith = gCPVal(container, 'iconWdith', [100],{sKey:'iconWdithStatus', fields:['iconWdith']});
+        const iconWdith = gCPVal(container, 'iconWdith', [96],{sKey:'iconWdithStatus', fields:['iconWdith']});
+        const iconImageSp = gCPVal(container, 'iconImageSp', [16],{sKey:'iconImageSpStatus', fields:['iconImageSp']});
         const iconBgColor = gCPVal(container, 'iconBgColor', [100],{sKey:'iconBgColorStatus', fields:['iconBgColor']});
 
         this.tabStyle = {
@@ -816,6 +846,7 @@
           subTitleIconShadow,
           subTitleIconBorder,
           iconWdith,
+          iconImageSp,
           iconBgColor,
           titleBgColor,
           titleActBgColor,

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -5,6 +5,7 @@
       class="category_wraper"
       :style="[categoryWaperComp]"
     >
+      <!--文字导航菜单区域-->
       <view v-if="showParent && isShowCategory" >
         <view class="tab_wrap" :style="[{backgroundColor:titleBgcColor}]">
           <cus-tab
@@ -28,6 +29,8 @@
           ></cus-tab>
         </view>
       </view>
+      <!--文字导航菜单区域-->
+      <!--图片导航菜单区域-->
       <view
         v-if="imageIconList.length"
         class="sub_category_list-box"
@@ -44,6 +47,7 @@
             <view
               :id="'cate-scroll__index-'+i"
               @click="handleCateClick(sub, 1)"
+              :style="[{width: subTitleInIcon.width}]"
             >
               <view
                 :style="[sub.category_id === (['child','parentNew'].includes(showType)? uiPid:uiCateId )?subActTitleIcon:subTitleIcon,subTitleInIcon]"
@@ -61,6 +65,7 @@
           </view>
         </scroll-view>
       </view>
+      <!--图片导航菜单区域-->
       <!--parentNew-->
       <view
         class="cate_child"
@@ -227,23 +232,30 @@ export default {
     }
   },
   computed: {
+    getImageHeightComp(){
+      let {iconWdith} = this.tabStyle
+      let iconOther = 76;
+
+      //图片最大高度为100
+      return iconOther + Number(iconWdith);
+    },
     categoryWarperMaskComp(){
       let height = 0;
       switch(this.showType){
         case 'all' :
           height += 88; //一级菜单
-          if(this.imageIconList.length > 0) height = height + 176 //二级菜单
+          if(this.imageIconList.length > 0) height = height + this.getImageHeightComp //二级菜单
           //语句
           break;
         case 'parent' :
           height = 88;
           break;
         case 'parentNew' :
-          height += 176; //一级菜单
+          height += this.getImageHeightComp; //一级菜单
           if(this.subCategory.length > 0) height = height + 92 //二级菜单
           break;
         case 'child' :
-          height = 176
+          height = this.getImageHeightComp
           break;
         default:
           height = 88
@@ -482,19 +494,22 @@ export default {
     border-left-width: 0!important;
     border-right-width: 0!important;
     border-bottom-width: 0!important;
-    height: 176rpx;
+    max-height: 176rpx;
 
     .sub_category_list {
       white-space: nowrap;
       height: 100%;
+      display: flex;
+      justify-content: flex-start;
+      align-content: center;
+      flex-flow: nowrap;
 
       .sub_cate {
         display: inline-block;
-        margin: 16rpx 16rpx 16rpx 0;
+        margin: 16rpx var(--sub-icon-right-sp) 16rpx 0;
+        padding: 0 16rpx;
         text-align: center;
-        width: 128rpx;
-        height: 144rpx;
-        flex-shrink: 0;
+
         &:last-child {
           margin-right: 32rpx;
         }
@@ -502,20 +517,8 @@ export default {
           margin-left: 32rpx;
         }
 
-        &.icon > view {
-          display: flex;
-          justify-content: center;
-          align-content: space-between;
-          height: 100%;
-          width: 100%;
-          flex-flow: wrap;
-
-        }
 
         .sub_icon {
-          width: 96rpx;
-          height: 96rpx;
-          margin: 0 auto;
           overflow: hidden;
           box-sizing: border-box;
           display: flex;
@@ -532,11 +535,15 @@ export default {
         }
 
         .sub_name {
+          width: 100%;
           font-size: 24rpx;
           color: #333333;
           margin-top: 8rpx;
-          .uni-one-cut(36);
+          overflow: hidden;
+          white-space: wrap;
+          word-break: break-all;
           line-height: 36rpx;
+          height: 36rpx;
         }
       }
     }

package/src/components/JfbMallProductList/cateMixins.js

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

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

@@ -390,7 +390,7 @@ export default (data, gValue,gColor,oldData)=>{
       groupKey:'content',
       ele: "xd-style-image",
       valueKey: "categoryLayout",
-      value: data['categoryLayout'] || 'v1',
+      value: data['categoryLayout'] || '',
       hidden: true,
       handleCustom({action, data}) {
         data.cb([

package/src/components/JfbMallProductList/cusAttr/icon.js

@@ -159,13 +159,44 @@ export default (data, gValue, gColor, oldData)=>{
       groupKey: 'style',
       ele: 'xd-slider',
       valueKey: "iconWdith",
-      value: dataVal({data, key:'iconWdith', dValue:100, gValue}),
+      value: dataVal({data, key:'iconWdith', dValue:96, gValue}),
       hidden: !statusShow({data, key: 'iconWdithStatus', fields:['iconWdith'], gValue}),
       className: "input80",
       labelInline: true,
       setting:{
         min: 50,//最小值
-        max: 100, //最小值
+        max: 96, //最小值
+        step:1, //步长
+        showStops:false,//显示间断点
+        showInput:false,//显示输入框
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '图标间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'iconImageSpStatus',
+      value: statusDataVal({data, key:'iconImageSpStatus', fields:['iconImageSp'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "iconImageSp",
+      value: dataVal({data, key:'iconImageSp', dValue:16, gValue}),
+      hidden: !statusShow({data, key: 'iconImageSpStatus', fields:['iconImageSp'], gValue}),
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 1,//最小值
+        max: 64, //最小值
         step:1, //步长
         showStops:false,//显示间断点
         showInput:false,//显示输入框