jufubao-mall 2.0.19 → 2.0.20-beta10

package/package.json

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

package/src/components/CusProduct/CusProduct.vue

@@ -17,6 +17,7 @@
     </view>
     <view class="product-content">
       <view class="product-content-info">
+
         <view class="name" :style="[nameFont]" v-html="cusName" :class="{showOne: isOne}"></view>
         <view
           class="brand"
@@ -206,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/Attr.js

@@ -1,467 +1,28 @@
 'use strict';
+import style from "./cusAttr/style";
+import advanced from "./cusAttr/advanced";
+import content from "./cusAttr/content";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
-    console.log(data['newLabel'],"data['newLabel']");
-    
+  content: (data, gValue, gColor, oldData={}) => {
+
+
     let cell = 4;
     if(data['contentCell']) cell = data['contentCell']
     let contentPadding = 20; //五列
     if(cell === 4) contentPadding = 25; //四列
     if (cell === 3) contentPadding = 30; //三列
-    let brandNumber = 300;
-    if(data['brandNumber'] !== undefined
-      && data['brandNumber'] !== null
-      &&  data['brandNumber'] !== ''
-    ){
-      brandNumber = data['brandNumber'];
-    }
-    return [
-      {
-        label: '显示列:',
-        ele: 'xd-radio',
-        valueKey: 'contentCell',
-        value: data['contentCell'] || 4,
-        placeholder: '请选择显示列',
-        multiple: false,
-        groupKey: 'content',
-        className: 'input50',
-        list: [
-          {label: '3列', value: 3},
-          {label: '4列', value: 4},
-          {label: '5列', value: 5},
-        ]
-      },
-      {
-        label: '展示品牌数量:',
-        ele: 'el-input',
-        valueKey: 'brandNumber',
-        value: brandNumber,
-        placeholder: '请选择品展示品牌数量',
-        classNmae: 'input60',
-        groupKey: 'content',
-      },
-      {
-        label: '品牌名称颜色:',
-        ele: 'xd-color',
-        valueKey: 'brandNameColor',
-        value: data['brandNameColor'] || '',
-        placeholder: '请选择品牌名称颜色',
-        classNmae: 'input80',
-        groupKey: 'content',
-      },
-
-      {
-        label: '品牌列表圆角:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: data['radius'] || '0',
-        placeholder: '请选择品牌列表圆角',
-        groupKey: 'content',
-        multiple: false,
-        className: 'input60',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: '品牌列表间距:',
-        ele: 'el-input',
-        groupKey: 'content',
-        type: 'text',
-        valueKey: 'contentPadding',
-        value: data['contentPadding'] || '',
-        placeholder: '请输入品牌列表间距',
-        className: 'input60',
-        inline: false,
-        notice:`设置列表间距，默认值:<span style="color:red">${contentPadding} </span>像素`
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        groupKey: 'content',
-        valueKey: 'contentBoxBgc',
-        value: data['contentBoxBgc'] || '',
-        placeholder: '请选择列表背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '背景图:',
-        ele: 'xd-upload',
-        valueKey: 'background',
-        groupKey: 'content',
-        value: data.background || {},
-        defaultValue: data.background || null,
-        slot: true,
-        oneWidth: 200,
-        oneHeight: 356,
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB，建议尺寸为：750*1334',
-        type: ['jpg', 'png', 'jpeg', 'gif'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: 5,
-        action: 'action',
-        sort: true,
-      },
-      {
-        label: '展示品牌分类范围:',
-        ele: 'xd-site-select-list',
-        valueKey: 'category_ids',
-        value: data['category_ids'] || [],
-        groupKey:'content',
-        setting: {
-          multiple: true,
-        },
-        className: 'input80',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getProductCategories')({
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-        inline: false,
-      },
-      {
-        label: '更改分类label(可排序):',
-        ele: 'xd-set-sort-label',
-        valueKey: 'newLabel',
-        value: data['newLabel'] || null,
-        defaultValue: data['newLabel'],
-        groupKey: 'content',
-        setting: {
-          isNeedSwitch: true,
-        },
-        list: [
-          {label: "全部", value: "all",sort:1,isShow: true},
-          {label: "线下", value: "sell",sort:2, isShow: true},
-          {label: "电子码", value: "code",sort:3, isShow: true},
-          {label: '线上-线上', sort:4, value: 'stod',isShow: true},
-          {label: '线上-同城配送', sort:5, value: 'stod-samecity',isShow: false},
-          {label: '线上-快递配送',sort:6, value: 'stod-logistics',isShow: false},
-          {label: '线上-门店自提',sort:7, value: 'stod-takeout',isShow: false},
-        ]
-      },
-
-      {
-        ele: 'title',
-        label: '切换标签设置',
-        size: 'small',
-        groupKey: 'style',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'titleBgc',
-        groupKey: 'style',
-        value: data['titleBgc'] || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '边距:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey: 'style',
-        valueKey: 'tabPadding',
-        value: data['tabPadding'] || '',
-        className: 'input60',
-        inline: false,
-        notice:'设置标签边距，默认值:<span style="color:red">40</span>像素'
-      },
-      {
-        label: '切换标签与内容之间间距:',
-        ele: 'el-input',
-        type: 'text',
-        groupKey: 'style',
-        valueKey: 'titlePadding',
-        value: data['titlePadding'] || '',
-        className: 'input60',
-        inline: false,
-        notice:'设置切换标签与内容之间间距，默认值:<span style="color:red">0</span>像素'
-      },
-      {
-        label: '未选标签背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'titleBgcColor',
-        value: data['titleBgcColor'] || '',
-        groupKey: 'style',
-        placeholder: '请选择未选中文字颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '选中标签背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'titleBgcActColor',
-        value: data['titleBgcActColor'] || '',
-        groupKey: 'style',
-        placeholder: '请选择选中标签背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '未选中文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'titleColor',
-        value: data['titleColor'] || '',
-        groupKey: 'style',
-        placeholder: '请选择未选中文字颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '选中文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'titleActColor',
-        value: data['titleActColor'] || '',
-        groupKey: 'style',
-        placeholder: '请选择选中文字颜色',
-        classNmae: 'input80',
-      },
-
-      {
-        label: '是否有投影:',
-        ele: 'xd-radio',
-        valueKey: 'isTitleShadow',
-        groupKey: 'style',
-        value: data['isTitleShadow'] || 'N',
-        placeholder: '请选择是否投影',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      data['isTitleShadow'] === 'Y' && {
-        groupKey: 'style',
-        label: '投影颜色:',
-        ele: 'xd-color',
-        valueKey: 'isTitleShadowBgc',
-        value: data['isTitleShadowBgc'] || '',
-        placeholder: '请选择投影颜色',
-        classNmae: 'input80',
-      },
-      data['isTitleShadow'] === 'Y' && {
-        groupKey: 'style',
-        label: '投影范围:',
-        ele: 'xd-site-select-list',
-        valueKey: 'isTitleShadowBgcW',
-        value: data['isTitleShadowBgcW'] || '10',
-        placeholder: '请选择投影范围',
-        multiple: false,
-        className: 'input60',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius',
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: '是否有边框:',
-        ele: 'xd-radio',
-        groupKey: 'style',
-        valueKey: 'isTitleBorder',
-        value: data['isTitleBorder'] || 'N',
-        placeholder: '请选择是否有边框',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      data['isTitleBorder'] === 'Y' && {
-        label: '边框颜色:',
-        groupKey: 'style',
-        ele: 'xd-color',
-        valueKey: 'isTitleBorderColor',
-        value: data['isTitleBorderColor'] || '',
-        placeholder: '请选择边框颜色',
-        classNmae: 'input80',
-      },
-      data['isTitleBorder'] === 'Y' && {
-        label: '边框大小:',
-        groupKey: 'style',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'isTitleBorderW',
-        value: data['isTitleBorderW'] || '',
-        placeholder: '请输入边框大小',
-        className: 'input60',
-      },
-      {
-        ele: 'title',
-        label: '内容设置',
-        size: 'small',
-        groupKey: 'style',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        groupKey: 'style',
-        valueKey: 'contentBgc',
-        value: data['contentBgc'] || '',
-        placeholder: '请选择内容背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '是否有投影:',
-        groupKey: 'style',
-        ele: 'xd-radio',
-        valueKey: 'isContShadow',
-        value: data['isContShadow'] || 'N',
-        placeholder: '请选择是否投影',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      data['isContShadow'] === 'Y' && {
-        label: '投影颜色:',
-        ele: 'xd-color',
-        groupKey: 'style',
-        valueKey: 'isContShadowBgc',
-        value: data['isContShadowBgc'] || '',
-        placeholder: '请选择投影颜色',
-        classNmae: 'input80',
-      },
-      data['isContShadow'] === 'Y' && {
-        label: '投影范围:',
-        ele: 'xd-site-select-list',
-        groupKey: 'style',
-        valueKey: 'isContShadowBgcW',
-        value: data['isContShadowBgcW'] || '10',
-        placeholder: '请选择投影范围',
-        multiple: false,
-        className: 'input60',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius',
-            key: Date.now()
-          })
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
-        },
-      },
-      {
-        label: '是否有边框:',
-        ele: 'xd-radio',
-        groupKey: 'style',
-        valueKey: 'isContBorder',
-        value: data['isContBorder'] || 'N',
-        placeholder: '请选择是否有边框',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      data['isContBorder'] === 'Y' && {
-        label: '边框颜色:',
-        ele: 'xd-color',
-        groupKey: 'style',
-        valueKey: 'isContBorderColor',
-        value: data['isContBorderColor'] || '',
-        placeholder: '请选择边框颜色',
-        classNmae: 'input80',
-      },
-      data['isContBorder'] === 'Y' && {
-        label: '边框大小:',
-        ele: 'el-input',
-        groupKey: 'style',
-        type: 'number',
-        valueKey: 'isContBorderW',
-        value: data['isContBorderW'] || 1,
-        placeholder: '请输入边框大小',
-        className: 'input60',
-      },
 
+    return [
+      ...content(data, gValue, gColor, oldData),
 
-      //高级属性
-      {
-        label: "选择业务线",
-        ele: "xd-choose-namespace",
-        valueKey: "xnamespace",
-        groupKey:'advanced',
-        value: data.xnamespace || "",
-        className:'input60',
-        handleCustom: (cb) => {
-          XdBus.getParentApi('getOptionsNamespaces')()
-            .then(res => {
-              cb(res.list)
-            })
-            .catch();
-        }
-      },
-      {
-        label: '是否开启城市筛选:',
-        ele: 'xd-radio',
-        valueKey: 'isCityFilter',
-        groupKey:'advanced',
-        value: data['isCityFilter'] || 'N',
-        placeholder: '请选择是否开启城市筛选',
-        multiple: false,
-        className: 'input80',
-        list: [
-          {label: '是', value: 'Y'},
-          {label: '否', value: 'N'},
-        ]
-      },
-      {
-        label: '线上品牌跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'onlineBrandPath',
-        placeholder: '请选择线上品牌路径',
-        groupKey:'advanced',
-        className: 'input100',
-        value: data.onlineBrandPath || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-      {
-        label: '线下品牌跳转路径:',
-        ele: 'xd-select-pages-path',
-        valueKey: 'offlineBrandPath',
-        groupKey:'advanced',
-        className: 'input100',
-        placeholder: '请选择线下品牌路径',
-        value: data.offlineBrandPath || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
 
+      ...style(data, gValue, gColor, oldData),
+      ...advanced(data, gValue, gColor, oldData),
     ].filter(i=>i)
   },
   advanced: [