jufubao-mall 2.0.75 → 2.0.77-beta1

package/package.json

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

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -102,7 +102,7 @@
                   <xd-list-item v-if="shop.takeoutTimeList" :label="shop.time_label" show-right :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" @click="toSetTakeoutTime(shopIndex,shop)" class="xd-my-list-item">
                     <view style="">{{shop.takeoutTime ? shop.takeoutTime.dateTime : '请选择'}}</view>
                   </xd-list-item>
-                </template>
+                </template> 
               </template>
             </view>
             <!-- <xd-list-item v-if="shop.delivery_message" :label="shop.delivery_message" paddingLR="48rpx" size="large"></xd-list-item> -->
@@ -132,6 +132,9 @@
             <xd-list-item v-if="showLogisticsAmount&&main_show_delivery_price==='Y'" label="商品运费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
               <xd-unit :price="orderFee.user_logistics_amount_origin" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
             </xd-list-item>
+            <xd-list-item label="平台服务费" :paddingLR="isCardLayout ? '32rpx' : '48rpx'">
+              <xd-unit :price="orderFee.main_user_server_amount" :isOld="false" :fontSize="28" :iconSize="0.3"></xd-unit>
+            </xd-list-item>
           </view>
           <view v-if="showPrice === 'Y' || otherPayMethod.filter(it => it.method!=='third').length" class="money_box">
             <template v-if="showPrice === 'Y'">
@@ -1554,6 +1557,7 @@
           product_amount: res.product_amount,
           plus_saving_money: res.plus_saving_money,
           origin_amount: res.origin_amount,
+          main_user_server_amount: res.main_user_server_amount,
         }
         //支付方式跟用户相关，与订单无关。
         //只获取一次。

package/src/components/JfbMallProductList/ComFilterQuery.vue

@@ -53,6 +53,9 @@
           </view>
         </view>
       </template>
+      <view v-if="combLayout==='Y'" class="jfb-filter-menu-ext" @click="handleCombLayout">
+        <xd-font-icon :icon="combIcon" width="50" :size="28"/>
+      </view>
     </view>
     <view class="jfb-filter-pop" :style="[queryTopComp]">
       <view
@@ -223,6 +226,15 @@ export default {
       type: Number,
       default: 3
     },
+
+    //组合布局, 组合内布局可互相切换
+    combLayout: {
+      type: String,
+      default: "N"
+    },
+    combIcon: {
+      type: String
+    }
   },
   filters:{
     fCusName(item){
@@ -799,6 +811,9 @@ export default {
 
     },
     //==其他菜单下拉操作====
+    handleCombLayout(){
+      this.$emit("switch-layout")
+    },
 
     update(){
       let params = {};
@@ -892,6 +907,11 @@ export default {
         //}
       }
 
+      &-ext{
+        display: flex;
+        align-items: center;
+      }
+
       &-name {
 
         &.fontWeight {

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -74,6 +74,8 @@
             ref="filter-query"
             :show-query="showQuery"
             :layout-info="layoutInfo"
+            :comb-layout="combLayout"
+            :comb-icon="switchLayoutIcon"
             :top-height="cateFixedHeight"
             :cus-menu-style="queryMenuStyleComp"
             :cus-pop-style="filterStyle"
@@ -84,6 +86,7 @@
             :def-remote="defMenuValue"
             :price-range="[startPrice, endPrice]"
             @on-change="handleFitlerChange"
+            @switch-layout="handleSwitchLayout"
           ></com-filter-query>
         </template>
         <!--搜索条件-->
@@ -216,6 +219,7 @@
   import posterMixins from "@/mixins/posterMixins";
   import CusPoster from "@/components/CusPoster/CusPoster.vue";
   import XdNoData from "@/components/XdNoData/XdNoData";
+  import storage from "@/common/storage";
 
   export default {
     name: "JfbMallProductList",
@@ -265,6 +269,7 @@
         contentColor:'',
         filterModeData:[],//菜单数量
         parentId:0, //获取商品分类父级ID
+        combLayout: "N", //组合布局, 组合内布局可互相切换
 
         //==搜索条件=============
         filterPadding:{},
@@ -416,6 +421,14 @@
         console.log('resultList', resultList);
         return resultList;
       },
+      switchLayoutIcon(){
+        //当前为2列时显示原始布局的icon，否则显示2列布局的icon
+        const targetLayout = this.column_num === 2
+          ? (this.orgColumnNum === 2 ? 1 : this.orgColumnNum)
+          : 2;
+        const iconMap = { 1: 'iconfenlei', 2: 'icona-huaban1', 3: 'iconsanlie', 4: 'icondanlie' };
+        return iconMap[targetLayout] || 'icona-huaban6';
+      }
     },
     watch: {
       container(value,oldValue) {
@@ -619,30 +632,20 @@
         this.xnamespace = gCPVal(container, 'xnamespace', this.projectAttr.business_code||this.xnamespace);
         this.listPadding = gCPVal(container,'listPadding', [{top:16, left:16, right:16,bottom:16},20], {sKey:'listPaddingStatus',fields:['listPadding'],isPMR: true});
         this.contentColor = gCPVal(container,'contentColor', ['#f8f8f8','#fafafa'], {sKey:'contentColorStatus',fields:['contentColor']});
+        this.combLayout = gCPVal(container, 'combLayout', 'N');
         let column_num = gCPVal(container, 'row_num', 2);
-        this.column_num = column_num;
-        //一列垂直
-        if(column_num === 4) {
-          this.column_num = 1;
-          this.columnOneLayout = 'V';
-          this.skeNumber = 10;
-          this.page_size = 20;
-        }
-        //一列水平
-        if( column_num === 1) {
-          this.skeNumber = 10;
-          this.page_size = 20;
-          this.columnOneLayout = 'H';
-        }
-        if( column_num === 2) {
-          this.skeNumber = 5;
-          this.page_size = 20;
-        }
-        if(column_num === 3) {
-          this.skeNumber = 6;
-          this.page_size = 21;
+        // 读取缓存的布局，若与当前配置相等或为互斥组合，则使用缓存值
+        const cachedLayout = storage.get('jfb_mall_product_list_layout');
+        if (cachedLayout != null && this.combLayout === 'Y' && !this.$configProject['isPreview']) {
+          const validPairs = [[4,2], [1,2], [2,1], [3,2]];
+          const isValid = cachedLayout === column_num || validPairs.some(([a, b]) => a === cachedLayout && b === column_num);
+          if (isValid) {
+            column_num = cachedLayout;
+          }
         }
-
+        this.column_num = column_num;
+        this.orgColumnNum = column_num;
+        this.handleColumnInit(column_num);
 
         //广告位置
         this.isPoster = gCPVal(container, 'isPoster', 'N');
@@ -975,7 +978,30 @@
         //记载完成
         this.initStatus = true;
       },
+      handleColumnInit(column_num){
+        //一列垂直
+        if(column_num === 4) {
+          this.column_num = 1;
+          this.columnOneLayout = 'V';
+          this.skeNumber = 10;
+          this.page_size = 20;
+        }
+        //一列水平
+        if( column_num === 1) {
+          this.skeNumber = 10;
+          this.page_size = 20;
+          this.columnOneLayout = 'H';
+        }
+        if( column_num === 2) {
+          this.skeNumber = 5;
+          this.page_size = 20;
+        }
+        if(column_num === 3) {
+          this.skeNumber = 6;
+          this.page_size = 21;
+        }
 
+      },
       //=====广告数据，商品列表， 分类数据，过滤条件===========
       //广告列表
       getPosterList(){
@@ -1242,6 +1268,17 @@
       },
       //==菜单相关操作==============
 
+      handleSwitchLayout(){
+        // 组合布局切换：当前布局 ↔ 2列布局
+        if(this.column_num === 2) {
+          this.column_num = this.orgColumnNum === 2 ? 1 : this.orgColumnNum;
+        } else {
+          this.column_num = 2;
+        }
+        storage.set('jfb_mall_product_list_layout', this.column_num);
+        this.handleColumnInit(this.column_num);
+      },
+
       toProductInfo(item){
         if (this.$configProject['isPreview'])return;
         toProductDetail(this, item, this.productInfoPath, item.isCart === 'Y');

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

@@ -129,113 +129,116 @@ export default (data, gValue,gColor,oldData)=>{
           });
       },
     },
-    {ele: 'group_start'},
-    {
-      label: "全部名称",
-      ele: "el-input",
-      valueKey: "allName",
-      value: data.allName || "",
-      labelInline: true,
-      className: "input100",
-      groupKey:'content',
-      inline:false,
-      notice:'设置全部自定义名称，默认值：<span style="color:red">全部</span>',
-      rules: [
-        {
-          required: false,
-          validator: (rule, value, callback) => {
-            value = value.trim();
-            if(value.length === 0) return callback()
-            if (value.length < 2 || value.length > 4) callback('全部自定义名称长度为：1-4字符');
-            else callback()
-          },
-          trigger: 'blur'
-        }
-      ],
-    },
-    {
-      label: '全部图标',
-      ele: 'xd-upload',
-      valueKey: 'allIcon',
-      value: data['allIcon'] || {},
-      defaultValue: data['allIcon'],
-      slot: true,
-      tipsformet: ``,
-      type: ['jpg', 'png', 'jpeg','gif'],
-      styleType: 'one',
-      uploadType: 'aliyun',
-      groupKey:'content',
-      size: .5,
-      action: 'aliyun',
-      oneWidth: 128,
-      oneHeight: 128,
-      labelInline: true,
-      inline:false,
-      notice:'建议尺寸：128*128像素',
-      rules: [
-        {
-          validator: (rule, value, callback) => {
-            if(!value) callback('请上传全部图片图片');
-            else {
-              if(!isObject(value)){
-                callback('请上传全部图片图片');
+    data.category !== 'none' && [
+      {ele: 'group_start'},
+      {
+        label: "全部名称",
+        ele: "el-input",
+        valueKey: "allName",
+        value: data.allName || "",
+        labelInline: true,
+        className: "input100",
+        groupKey:'content',
+        inline:false,
+        notice:'设置全部自定义名称，默认值：<span style="color:red">全部</span>',
+        rules: [
+          {
+            required: false,
+            validator: (rule, value, callback) => {
+              value = value.trim();
+              if(value.length === 0) return callback()
+              if (value.length < 2 || value.length > 4) callback('全部自定义名称长度为：1-4字符');
+              else callback()
+            },
+            trigger: 'blur'
+          }
+        ],
+      },
+      {
+        label: '全部图标',
+        ele: 'xd-upload',
+        valueKey: 'allIcon',
+        value: data['allIcon'] || {},
+        defaultValue: data['allIcon'],
+        slot: true,
+        tipsformet: ``,
+        type: ['jpg', 'png', 'jpeg','gif'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        groupKey:'content',
+        size: .5,
+        action: 'aliyun',
+        oneWidth: 128,
+        oneHeight: 128,
+        labelInline: true,
+        inline:false,
+        notice:'建议尺寸：128*128像素',
+        rules: [
+          ['v2', 'v3', 'v4'].includes(data.category) && {
+            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,
+          }
+        ].filter(i=>i),
+      },
+      {
+        label: '父级分类',
+        ele: 'xd-radio',
+        groupKey: 'content',
+        valueKey: 'categoryParentType',
+        value: categoryParentType,
+        labelInline:true,
+        className: 'input100',
+        list: [
+          {label: '根目录', value: 'root'},
+          {label: '自定义', value: 'child'},
+        ],
+        notice:'展示指定父级分类下的子级分类',
+        inline: false
+      },
+      {
+        label: '',
+        ele: 'el-input',
+        type: 'number',
+        labelInline: true,
+        valueKey: 'categoryParent',
+        cusStyle: {
+          paddingLeft: '90px'
+        },
+        value: dataVal({data, key:'categoryParent', dValue:'', gValue}),
+        groupKey:'content',
+        className: 'input100',
+        hidden: categoryParentType === 'root',
+        rules: [
+          {
+            validator: (rule, value, callback) => {
+              if(categoryParentType === 'root')  callback();
               else {
-                if(!value.url)callback('请上传全部图片图片');
+                if(!value) callback('请输入父级分类ID');
                 else callback()
               }
-            }
-          },
-          message: '请上传全部图片图片',
-          trigger: ['blur', 'change'],
-          required: true,
-        }
-      ],
-    },
-    {
-      label: '父级分类',
-      ele: 'xd-radio',
-      groupKey: 'content',
-      valueKey: 'categoryParentType',
-      value: categoryParentType,
-      labelInline:true,
-      className: 'input100',
-      list: [
-        {label: '根目录', value: 'root'},
-        {label: '自定义', value: 'child'},
-      ],
-      notice:'展示指定父级分类下的子级分类',
-      inline: false
-    },
-    {
-      label: '',
-      ele: 'el-input',
-      type: 'number',
-      labelInline: true,
-      valueKey: 'categoryParent',
-      cusStyle: {
-        paddingLeft: '90px'
+            },
+            message: '请输入父级分类ID',
+            trigger: ['blur', 'change'],
+            required: true,
+          }
+        ],
       },
-      value: dataVal({data, key:'categoryParent', dValue:'', gValue}),
-      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'},
+      {ele: 'group_end'},
+    ],
+    
     {
       label: "分类样式",
       ele: "xd-style-image",
@@ -301,6 +304,22 @@ export default (data, gValue,gColor,oldData)=>{
           });
       },
     },
+    {ele: 'group_start'},
+    {
+      label: "组合布局",
+      ele: "xd-radio",
+      groupKey: 'content',
+      valueKey: "combLayout",
+      value: dataVal({data, key:'combLayout', dValue:'N', gValue}),
+      labelInline:true,
+      inline: false,
+      list:[
+        {label:"开启", value:"Y"},
+        {label:"禁用", value:"N"}
+      ],
+      notice:'开启组合布局后，用户可在多个布局之间切换 ',
+    },
+    {ele: 'group_end'},
     {
       label: "商品样式",
       ele: "xd-style-image",
@@ -461,5 +480,5 @@ export default (data, gValue,gColor,oldData)=>{
 
     ...ProductAttr(data, gValue,gColor,oldData),
     ...PosterAttr(data, gValue,gColor,oldData)
-  ]
+  ].flat().filter(i=>i)
 }

package/src/components/JfbMallSearch/JfbMallSearch.vue

@@ -303,7 +303,7 @@
           })
         }else{
           this.$xdUniHelper.navigateTo({
-            url: this.productListPath + `?keyword=${this.keyword}`
+            url: this.productListPath + `?keyword=${this.keyword}&search_focus_back=Y`
           })
         }
       },