jufubao-mall 2.0.20-beta5 → 2.0.20-beta6

package/package.json

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

package/src/components/JfbMallBrandWall/JfbMallBrandWall.vue

@@ -285,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);
@@ -392,7 +391,7 @@
       },
       tabListComp(){
         let temp = {};
-        if(this.layout === 'v1') {
+        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';
@@ -478,13 +477,17 @@
         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,
         }
       },
@@ -509,6 +512,8 @@
           return {
             backgroundColor: bgColor,
             color: color,
+            fontSize: parseInt(this.titleStyle.actFontSize) + 'rpx',
+            fontWeight: this.titleStyle.actFontWeight,
           }
         }
 
@@ -530,7 +535,7 @@
           backgroundImage: bgImage,
           padding: '0 32rpx',
           color: color,
-          fontSize: this.titleStyle.actFontSize + 'rpx',
+          fontSize:  parseInt(this.titleStyle.actFontSize) + 'rpx',
           fontWeight: this.titleStyle.actFontWeight,
         }
       },
@@ -702,16 +707,16 @@
           [{
             color: titleColor || '#333',
             bgColor: titleBgcColor || '#fff' ,
-            fontSize: '32',
+            fontSize: this.layout === 'v2' ?'24':'32',
             fontWeight: '400',
             actColor: titleActColor || '',
-            actFontWeight: '400',
-            actFontSize: '32',
+            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']});
 

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

@@ -4,7 +4,6 @@ import {dataVal, statusDataVal, statusShow, clone, cRaBorShadow,isDefStatus} fro
 
 export default (datas, gValue, gColor, oldData={})=>{
   let data = clone(datas);
-  debugger
   if(typeof data['tabPadding'] === 'string' && data['tabPadding'] ) {
     data['tabPadding'] = {
       top: Number(data['tabPadding']),
@@ -100,7 +99,7 @@ export default (datas, gValue, gColor, oldData={})=>{
           fontSize:'32',
           fontWeight: '400',
           actFontSize:'32',
-          actFontWeight: '400',
+          actFontWeight: '500',
           actColor: data['titleActColor'] || gValue.mainColor,
           actBgColor: data['titleBgcActColor'] || ''
         },

package/src/components/JfbMallProductList/Api.js

@@ -33,14 +33,14 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getMallCategoryTree',
+    mapFnName: 'getNewMallCategoryTree',
     title: '分类 - 树列表',
-    path: '/product/v1/:xnamespace/category/index',
+    path: '/product/v1/:xnamespace/category/tree',
     isRule: false,
     params: {
       xnamespace: ['xnamespace', 'String', '必选'],
-      group_id: ['分组ID', 'Number', '必选'],
-      need_rec: ['是否需要推荐分类', 'Number', '必选'],
+      level: ['获取几层数据，默认：2', 'Number', '必选', 2],
+      root_category_id: ['父级分类，默认：0', 'Number', '必选', 0],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbMallProductList/ComFilterQuery.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="jfb-filter" v-if="showQuery === 'Y'" :style="[cssStyle]">
+
     <view class="jfb-filter-placeholder" :style="[placeholderStyleComp]"></view>
     <view class="jfb-filter-menu" :style="[cusMenuStyle,menuStyleTopComp]">
       <template v-if="sortList.length > 0">
@@ -95,7 +96,7 @@
                   :class="{
                     active: isOtherActive(tab, item.value),
                     noMarginRigth: i%column === (column-1),
-                    noMarginTop: i/column <= 1
+                    noMarginTop: i/column < 1
                   }"
                   @click="setOhterChooseTag(tab, item)"
                 >{{item.label}}</view>
@@ -252,19 +253,19 @@ export default {
       return {
         zIndex: this.showQueryModal ? 1002 : 1,
         position:this.$configProject.isPreview?'absolute':'fixed',
-        top: this.$configProject.isPreview ? 0 : this.queryMaskComp.top
+        top: this.$configProject.isPreview ? 0 : (parseInt(this.queryMaskComp.top) - 2) + 'rpx',
       }
     },
     queryTopComp(){
       let {paddingTb} =  this.cusMenuStyle;
       let height = 48;//默认90高，填充0
       return {
-        top:  this.topHeight + this.layoutInfo.top + (height + paddingTb - 4)  + 'rpx'
+        top:  this.topHeight + this.layoutInfo.top + (height + paddingTb - 2)  + 'rpx'
       }
     },
     menuTextColorComp(){
       return {
-        color: this.cusMenuStyle.color || '#666'
+        color: this.cusMenuStyle.color || '#999'
       }
     },
 
@@ -331,7 +332,7 @@ export default {
       if(this.menuAct !== 'common') {
         params = {
           ...params,
-          borderColor: Color(font.color).alpha(0.01).toString(),
+          borderColor: Color(font.color).alpha(0.2).toString(),
           backgroundColor: Color(font.color).alpha(0.1).toString(),
         }
       }
@@ -776,7 +777,8 @@ export default {
       border-top: 1px solid var(--com-menu-border);
       display: flex;
       justify-content: space-around;
-      height: 48rpx;
+      height: 49rpx;
+
 
       &-item {
         display: flex;
@@ -893,7 +895,7 @@ export default {
 
             & > ._tag {
               text-align: center;
-              line-height: 66rpx;
+              line-height: 62rpx;
               border-radius: 4rpx;
               font-size: 24rpx;
               color: #666;
@@ -902,6 +904,9 @@ export default {
               white-space: nowrap;
               box-sizing: border-box;
               background-color: #f8f8f8;
+              border-width: 2rpx;
+              border-style: solid;
+              padding: 0 10rpx;
 
               &.noMarginRigth{
                 margin-right: 0!important;

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -24,7 +24,6 @@
         <view v-if="!loaded" class="skeleton-cate">
           <view class="cate_tab" v-if="showCategory === 'Y'">
             <view class="cate_tab_item" v-for="i in 5" :key="i"></view>
-
           </view>
           <view class="sub_cate" v-if="showCategory === 'Y'">
             <view class="sub_cate_item" v-for="i in 5" :key="i">
@@ -449,6 +448,12 @@
         if(this.initStatus && this.onLoadStatus) this.handleInit();
       },
 
+      filterModeData(){
+        if(this.$configProject.isPreview) {
+          this.$refs['filter-query'].hideSelectMenu();//隐藏菜单
+        }
+      },
+
     },
     created() {
       this.isPreview = this.$configProject.isPreview;
@@ -663,7 +668,7 @@
         let defFilterBgcColor = '#fff';
         if( category ==='v4') defFilterBgcColor = this.pageAttr.background;
         this.filterBgcColor = gCPVal(container, 'filterBgcColor', [defFilterBgcColor,'#fff'], {sKey: 'filterBgcColorStatus',fields:['filterBgcColor']});
-        this.filterColor = gCPVal(container, 'filterColor', ['#666'], {sKey: 'filterColorStatus',fields:['filterColor']});
+        this.filterColor = gCPVal(container, 'filterColor', ['#333'], {sKey: 'filterColorStatus',fields:['filterColor']});
         this.filterTopBorder = gCPVal(container, 'filterTopBorder', [{ color: '#f8f8f8', width: '2', style: 'solid'},{ color: '#f8f8f8', width: '0', style: 'solid'}], {isBorder:true});
         this.filterTopBorderWidth = gCPVal(container, 'filterTopBorder', [{ color: '#f8f8f8', width: '2', style: 'solid'},{ color: '#f8f8f8', width: '0', style: 'solid'}], {isBorder:true, isBsWidth: true});
 
@@ -809,22 +814,25 @@
 
         //二级导航文字颜色
         this.level2BgcColor = gCPVal(container, 'level2BgcColor', ['#fff','#f8f8f8'],{sKey:'level2BgcColorStatus', fields:['level2BgcColor']});
+
+        let color = gCPVal(container, 'level2Color', '') || '#333',
+          actColoor= this.mainColor , bgColor='',bgActColor='';
+        if(categoryLayout1ShowType === 'parentNew') {
+          actColoor = '#fff';
+          bgActColor = this.mainColor;
+        }
+
         const level2Name = gCPVal(container, 'level2Name', {
           fontSize: '24',
           actFontSize: '24',
-          color: gCPVal(container, 'level2Color', '') || '#333',
-          actColor: this.mainColor,
-          bgColor:'',
-          actBgColor:'',
+          color: color,
+          actColor:actColoor,
+          bgColor:bgColor,
+          actBgColor:bgActColor,
           fontWeight: 'normal',
           actFontWeight: 'normal',
-          borderStyle:'solid',
-          borderColor: 'rgba(0,0,0,0)',
-          borderWidth: 0,
-          borderActStyle:'solid',
-          borderActColor: 'rgba(0,0,0,0)',
-          borderActWidth:0,
         },{sKey:'level2NameStatus', fields:['level2Name','level2Color'],isMerge: true});
+        debugger
 
         const subTitleRadius = gCPVal(container, 'subTitleRadius', ['40rpx'],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
         const subTitleIconShadow  = gCPVal(container, 'subTitleIconShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
@@ -1047,13 +1055,12 @@
       getCategoryList(){
         return new Promise((resolve)=>{
           if(this.showCategory==="Y") {
-            jfbRootExec("getMallCategoryTree", {
+            jfbRootExec("getNewMallCategoryTree", {
               vm: this,
               data: {
                 xnamespace: this.xnamespace,
-                parent_id: this.parentId,
+                root_category_id: Number(this.parentId),
                 level: 2,
-                need_rec: this.options.need_rec
               }
             })
               .then(res => {

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -57,6 +57,7 @@
                   <image :src="sub.category_icon" style="width:100%;height:100%"/>
                 </view>
               </view>
+              <view style="margin-top: 8rpx; height: 36rpx"></view>
               <view
                 class="sub_name"
                 :style="[sub.category_id === (['child','parentNew'].includes(showType)? uiPid:uiCateId )?level2ActNameComp:level2NameComp]"
@@ -332,13 +333,14 @@ export default {
 
   methods: {
     init(navList, pid){
+      debugger
       if(navList.length === 0) return;
 
       //预览模式生效
       if(this.isPreview) {
         navList = navList.filter(item=>{
           //显示父级显示全部分类
-          if(['all', 'parent','parentNew'].includes(this.showType)) return true
+          if(['all', 'parent','parentNew','child'].includes(this.showType)) return true
           //只显示子级去掉全部分类
           else return item.category_id !== -1
         });
@@ -353,6 +355,14 @@ export default {
         this.subCategory = navList[this.tabIndex].children;
       }
 
+      //图片样式作为一级显示时候(预览模式)
+      if(['child','parentNew'].includes(this.showType)) {
+        if(this.pid === '') {
+          this.uiPid = -1;
+          this.initPid = -1;
+        }
+      }
+
       this.transformNavList = navList;
       this.refreshNav = Date.now()
 
@@ -504,12 +514,17 @@ export default {
       align-content: center;
       flex-flow: nowrap;
 
+
       .sub_cate {
         display: inline-block;
         margin: 16rpx var(--sub-icon-right-sp) 16rpx 0;
         padding: 0 16rpx;
         text-align: center;
 
+        & > view {
+          position: relative;
+        }
+
         &:last-child {
           margin-right: 32rpx;
         }
@@ -541,6 +556,7 @@ export default {
           margin-top: 8rpx;
           overflow: hidden;
           white-space: wrap;
+          box-sizing: border-box;
           word-break: break-all;
           line-height: 36rpx;
           height: 36rpx;

package/src/components/JfbMallProductList/XdCateV2.vue

@@ -160,14 +160,19 @@ export default {
     },
     cateBarStyleRLComp(){
       return {
-        backgroundColor: Color( this.styleConfig.backgroundColor).lighten(.2).hex().toString()
+        backgroundColor: Color( this.styleConfig.backgroundColor).lighten(.2).hex().toString(),
       }
     },
     cateBarStyleComp(){
+      let orderColor = '';
+      let {backgroundColor} = this.styleConfig;
+      if(Color(backgroundColor).isDark()) orderColor = Color(backgroundColor).lighten(0.8).toString();
+      else if(Color(backgroundColor).isLight()) orderColor = Color(backgroundColor).darken(0.05).toString();
+
       return {
         top: this.$configProject.isPreview?0:(this.layoutInfo.top) + 'rpx',
         backgroundColor: this.styleConfig.backgroundColor,
-        '--border-color': Color( this.styleConfig.backgroundColor).lighten(.5).hex().toString(),
+        '--border-color': orderColor,
         position: this.$configProject.isPreview?'absolute':'fixed',
       };
     },
@@ -362,7 +367,7 @@ export default {
       display: flex;
       justify-content: center;
       align-items: center;
-      border-left: 2rpx solid #f8f8f8;;
+      border-left: 4rpx solid var(--border-color);
       background: #FFFFFF;
       z-index: 1;
       flex-shrink: 0;

package/src/components/JfbMallProductList/cateMixins.js

@@ -25,9 +25,20 @@ export default {
         borderWidth:level2Name.borderWidth + 'rpx',
         borderColor:level2Name.borderColor,
         padding: padding,
-        borderRadius: radius
+        borderRadius: radius,
+        ...this.parentNewComp,
       }
     },
+
+    parentNewComp(){
+      return {
+        position: 'absolute',
+        bottom: '0',
+        left: '-16rpx',
+        width: `calc(100% + 32rpx)`
+      }
+    },
+
     level2ActNameComp(){
       if(this.$xdUniHelper.isEmpty(this.tabStyle)) return {}
       if(this.$xdUniHelper.isEmpty(this.tabStyle['level2Name'])) return {}
@@ -48,7 +59,8 @@ export default {
         borderWidth:level2Name.borderActWidth + 'rpx',
         borderColor:level2Name.borderActColor,
         padding: padding,
-        borderRadius: radius
+        borderRadius: radius,
+        ...this.parentNewComp,
       }
     },
 

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

@@ -6,7 +6,8 @@ import {
   customVal,
   cusDisabled ,
   getCustomAttr,
-  isArray
+  isArray,
+  isObject
 } from "@/utils/AttrTools";
 import PosterAttr from "@/utils/Attr/PosterAttr";
 import ProductAttr from "@/utils/Attr/ProductAttr";
@@ -172,7 +173,23 @@ export default (data, gValue,gColor,oldData)=>{
       inline:false,
       notice:'建议尺寸：128*128像素',
       rules: [
-        {required: true, message: '请上传全部图标', trigger: ['blur', 'change']},
+        {
+          validator: (rule, value, callback) => {
+            if(!value) callback('请上传全部图片图片');
+            else {
+              if(!isObject(value)){
+                callback('请上传全部图片图片');
+              }
+              else {
+                if(!value.url)callback('请上传全部图片图片');
+                else callback()
+              }
+            }
+          },
+          message: '请上传全部图片图片',
+          trigger: ['blur', 'change'],
+          required: true,
+        }
       ],
     },
     {
@@ -203,6 +220,20 @@ export default (data, gValue,gColor,oldData)=>{
       groupKey:'content',
       className: 'input100',
       hidden: categoryParentType === 'root',
+      rules: [
+        {
+          validator: (rule, value, callback) => {
+            if(categoryParentType === 'root')  callback();
+            else {
+              if(!value) callback('请输入父级分类ID');
+              else callback()
+            }
+          },
+          message: '请输入父级分类ID',
+          trigger: ['blur', 'change'],
+          required: true,
+        }
+      ],
     },
     {ele: 'group_end'},
     {

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

@@ -1,10 +1,13 @@
 'use strict';
 
 import {cRaBorShadow, dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
-const Color = require('color');
 
 export default (data, gValue, gColor, oldData)=>{
   let filterTopBorder = cRaBorShadow(data , 'filterTopBorder',{dValue:'D'}, gValue)
+  let filterBgcColor = '#fff';
+  if(gValue.isAdd && gValue.isFirst) {
+    if(data['category'] === 'v4') filterBgcColor = '#f8f8f8';
+  }
   return [
     {
       ele: 'title',
@@ -70,7 +73,7 @@ export default (data, gValue, gColor, oldData)=>{
       ele: 'xd-color',
       valueKey: 'filterBgcColor',
       groupKey:'style',
-      value: dataVal({data, key:'filterBgcColor', dValue:'#fff', gValue}),
+      value: dataVal({data, key:'filterBgcColor', dValue:filterBgcColor, gValue}),
       hidden: !statusShow({data, key: 'filterBgcColorStatus', fields:['filterBgcColor'], gValue}),
       classNmae: 'input80',
       setting: {
@@ -97,7 +100,7 @@ export default (data, gValue, gColor, oldData)=>{
       ele: 'xd-color',
       valueKey: 'filterColor',
       groupKey:'style',
-      value: dataVal({data, key:'filterColor', dValue:'#999', gValue}),
+      value: dataVal({data, key:'filterColor', dValue:'#333', gValue}),
       hidden: !statusShow({data, key: 'filterColorStatus', fields:['filterColor'], gValue}),
       classNmae: 'input80',
       setting: {

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

@@ -253,10 +253,10 @@ export default (data, gValue, gColor, oldData)=>{
       hidden: !statusShow({data, key: 'level2NameStatus', fields:['level2Name','level2Color'], gValue}) || disabled,
       setting: {
         fontSize: true,
-        weight:true,
+        weight:false,
         bgColor:true,
         selected:true,
-        isBorder:true,
+        isBorder:false,
         default: level2Name
       },
       handleCustom({action, data}) {

package/src/components/JfbMallRecommendProduct/cusAttr/style.js

@@ -200,6 +200,7 @@ export default (data, gValue, gColor, oldData={})=>{
       hidden: !statusShow({data, key: 'titleRadiusStatus', fields:['titleRadius'], gValue}),
       placeholder: '请选择商品是否设置圆角',
       multiple: false,
+      isBackNotValue: true,
       className: 'input80',
       groupKey:'style',
       handleCustom({action, data}) {
@@ -409,7 +410,7 @@ export default (data, gValue, gColor, oldData={})=>{
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'contRadiusStatus',
-      value: statusDataVal({data, key:'contRadiusStatus',cValue:'N', fields:['contRadius'],gValue}),
+      value: statusDataVal({data,key:'contRadiusStatus',cValue:'N', fields:['contRadius'],gValue}),
       labelInline:true,
       list: [
         {label: '默认', value: 'D'},
@@ -428,6 +429,7 @@ export default (data, gValue, gColor, oldData={})=>{
       placeholder: '请选择商品是否设置圆角',
       multiple: false,
       className: 'input80',
+      isBackNotValue: true,
       groupKey:'style',
       handleCustom({action, data}) {
         XdBus.getParentApi('getOptionsSettingList')({
@@ -469,6 +471,7 @@ export default (data, gValue, gColor, oldData={})=>{
       placeholder: '请选择商品图圆角是否设置圆角',
       multiple: false,
       className: 'input80',
+      isBackNotValue: true,
       value: dataVal({data, key:'imageRadius', dValue:'10', gValue}),
       hidden: !statusShow({data, key: 'imageRadiusStatus', fields:['imageRadius'], gValue}),
       handleCustom({action, data}) {