jufubao-mall 2.0.35-beta4 → 2.0.35-beta6

package/src/components/JfbMallProductList/Attr.js

@@ -8,7 +8,6 @@ export default {
   style: [],
   advanced: [],
   content: (data, gValue, gColor, oldData={})=>{
-    debugger
     console.log(data['row_num'],"data['row_num']");
 
     let defContShadow = oldTonNewBorAndSha(

package/src/components/JfbMallShopVip/JfbMallShopVip.vue

@@ -108,7 +108,7 @@
                   v-for="item in nearbyShopList"
                   :key="item.key"
                   :id="`scroll-${item.resource_shop_id}`"
-                  @click.shop="handleToEvent(item, 'shop')"
+                  @click.stop="handleToEvent(item, 'shop')"
                 >
                   <view class="shop_list-item-title">
                     <view class="title">

package/src/components/JfbMallHomeBrand/cusAttr/advanced.js

@@ -1,103 +0,0 @@
-'use strict';
-
-export default (data)=>{
-  let isCityFilter = 'N',
-    allBrandPath =null,
-    onlineBrandPath =null,
-    offlineBrandPath =null;
-
-  if(['Y','N'].includes(data['isCityFilter'])) {
-    isCityFilter = data['isCityFilter']
-  }
-  if(data['allBrandPath'] !== undefined) {
-    allBrandPath = data['allBrandPath']
-  }
-  if(data['onlineBrandPath'] !== undefined) {
-    onlineBrandPath = data['onlineBrandPath']
-  }
-  if(data['offlineBrandPath'] !== undefined) {
-    offlineBrandPath = data['offlineBrandPath']
-  }
-  return [
-    {
-      label: '城市筛选',
-      ele: 'xd-radio',
-      valueKey: 'isCityFilter',
-      groupKey:'advanced',
-      value: isCityFilter,
-      placeholder: '请选择是否开启城市筛选',
-      multiple: false,
-      labelInline:true,
-      list: [
-        {label: '开启', value: 'Y'},
-        {label: '禁用', value: 'N'},
-      ]
-    },
-
-
-    {
-      label: '全部品牌',
-      ele: 'xd-select-pages-path',
-      valueKey: 'allBrandPath',
-      placeholder: '请选择全部品牌跳转地址',
-      groupKey:'advanced',
-      labelInline: true,
-      className: 'input100',
-      value: allBrandPath,
-      setting: {
-        mode: 'new',
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-    },
-    {
-      label: '线上品牌',
-      ele: 'xd-select-pages-path',
-      valueKey: 'onlineBrandPath',
-      placeholder: '请选择线上品牌跳转地址',
-      labelInline: true,
-      className: 'input100',
-      value: onlineBrandPath,
-      groupKey: 'advanced',
-      setting: {
-        mode: 'new',
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-    },
-    {
-      label: '线下品牌',
-      ele: 'xd-select-pages-path',
-      valueKey: 'offlineBrandPath',
-      placeholder: '请选择线下品牌跳转地址',
-      labelInline: true,
-      className: 'input100',
-      value: offlineBrandPath,
-      setting: {
-        mode: 'new',
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      groupKey: 'advanced',
-    },
-
-    {
-      label: '版本号:',
-      ele: 'el-input',
-      type: 'text',
-      groupKey: 'advanced',
-      valueKey: 'version',
-      value: 'v2.0',
-      hidden: true,
-    },
-    {
-      label: '过滤引用模版字段:',
-      ele: 'el-input',
-      type: 'text',
-      groupKey: 'advanced',
-      valueKey: 'refFilterKey',
-      value: '[]',
-      hidden: true,
-    },
-
-
-  ]
-}
-

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

@@ -1,452 +0,0 @@
-'use strict';
-
-import {
-  dataVal,
-  statusDataVal,
-  statusShow,
-  clone,
-  cRaBorShadow,
-  isDefStatus,
-  oldTonNewBorAndSha
-} from "@/utils/AttrTools";
-
-export default (datas, gValue, gColor, oldData={})=>{
-  let data = clone(datas);
-  let listLayout = 'slide';
-  if(data['listLayout'] !== undefined)  listLayout = data['listLayout'];
-
-  let defContBorder = oldTonNewBorAndSha(data.itemBorder, data.is_border,data.is_border_w ,data.is_border_c,'solid');
-  if(defContBorder.type === 'Y' && data.is_border ==='Y') {
-    data.is_border = 'N'
-  }
-
-  let defContShadow = oldTonNewBorAndSha(data.itemShadow, data.is_shadow,data.is_shadow_w ,data.is_shadow_bg,'solid');
-  if(defContShadow.type === 'Y' && data.is_shadow ==='Y') {
-    data.is_shadow = 'N'
-  }
-
-  debugger
-
-  return [
-    {
-      ele: 'title',
-      label: '品牌样式',
-      size: 'small',
-      groupKey:'style',
-    },
-    {
-      label: '品牌间距',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'paddingStatus',
-      value: statusDataVal({data, key:'paddingStatus', fields:['padding','rowSpacing'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "列间距",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "padding",
-      value: dataVal({data, key:'padding', dValue:32, gValue}),
-      hidden: !statusShow({data, key: 'paddingStatus', fields:['padding','rowSpacing'], gValue}),
-      className: "input80",
-      labelInline: true,
-      setting:{
-        min: 0,//最小值
-        max: 96, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      }
-    },
-    {
-      label: "行间距",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "rowSpacing",
-      value: dataVal({data, key:'rowSpacing', dValue:gValue.isAdd && gValue.isFirst ?12: 10, gValue}),
-      hidden: listLayout === 'slide' || !statusShow({data, key: 'paddingStatus', fields:['padding','rowSpacing'], gValue}),
-      className: "input80",
-      labelInline: true,
-      setting:{
-        min: 0,//最小值
-        max: 96, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-      }
-    },
-    {ele: 'group_end'},
-    {
-      label: '品牌图大小',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'bindSizeStatus',
-      value: statusDataVal({data, key: 'bindSizeStatus', fields:['bindSize'], gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "bindSize",
-      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: 50,//最小值
-        max: 90, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      }
-    },
-    {ele: 'group_end'},
-    {
-      label: '品牌文字',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'listTitleStatus',
-      value: statusDataVal({data, key:'listTitleStatus', fields:['listTitle'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: "",
-      ele: "xd-font",
-      valueKey: "listTitle",
-      value: dataVal({data, key:'listTitle', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'listTitleStatus', fields:['listTitle'], gValue}),
-      groupKey:'style',
-      setting: {
-        color:true,
-        fontSize: true,
-        weight: true,
-        decoration: false,
-        icon: false,
-        style:false,
-        align:false,
-        lineHeight: false,
-        isEmpty: true,
-        default:{
-          color:'#777',
-          fontSize:'24rpx',
-          style:'normal',
-        }
-      },
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
-          .then(res => {
-            data.cb(res.list)
-          })
-          .catch(error => {
-            data.cb([])
-            console.error(error);
-          });
-      },
-
-    },
-    {ele: 'group_end'},
-    {
-      label: '品牌背景',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'backgroundColorStatus',
-      value: statusDataVal({data, key:'backgroundColorStatus', fields:['backgroundColor'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-color',
-      valueKey: 'backgroundColor',
-      value: dataVal({data, key:'backgroundColor', dValue:{}, gValue}),
-      hidden: !statusShow({data, key: 'backgroundColorStatus', fields:['backgroundColor'], gValue}),
-      placeholder: '请选择品牌背景',
-      classNmae: 'input60',
-      groupKey: 'style',
-      labelInline: true,
-      setting: {
-        showAlpha: true
-      }
-    },
-    {ele: 'group_end'},
-    {
-      label: '背景圆角',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'newRadiusStatus',
-      value: statusDataVal({data, key:'newRadiusStatus',cValue: 'N', fields:['newRadius'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'newRadius',
-      value: dataVal({data, key:'newRadius', dValue:'10', gValue}),
-      hidden: !statusShow({data, key: 'newRadiusStatus', fields:['newRadius'], gValue}),
-      placeholder: '请选择更多圆角',
-      multiple: false,
-      className: 'input80',
-      groupKey:'style',
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({
-          setting_id: 'edtix_style_radius',
-          key: Date.now()
-        })
-          .then(res => {
-            debugger
-            res.list = res.list.filter(item=>{
-              return item.label !== '无';
-            });
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '品牌圆角',
-      ele: 'xd-radio',
-      groupKey: 'style',
-      valueKey: 'iconNewRadiusStatus',
-      value: statusDataVal({data, key:'iconNewRadiusStatus',cValue: 'N', fields:['iconNewRadius'],gValue}),
-      labelInline:true,
-      list: [
-        {label: '默认', value: 'D'},
-        {label: '无圆角', value: 'N'},
-        {label: '自定义', value: 'C'},
-      ]
-    },
-    {ele: 'group_start'},
-    {
-      label: '',
-      ele: 'xd-site-select-list',
-      labelInline: true,
-      valueKey: 'iconNewRadius',
-      value: dataVal({data, key:'iconNewRadius', dValue:'10', gValue}),
-      hidden: !statusShow({data, key: 'iconNewRadiusStatus', fields:['iconNewRadius'], gValue}),
-      placeholder: '请选择更多圆角',
-      multiple: false,
-      className: 'input80',
-      groupKey:'style',
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({
-          setting_id: 'edtix_style_radius',
-          key: Date.now()
-        })
-          .then(res => {
-            debugger
-            res.list = res.list.filter(item=>{
-              return item.label !== '无';
-            });
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-          });
-      },
-    },
-    {ele: 'group_end'},
-    {
-      label: '品牌描边',
-      ele: 'xd-border',
-      groupKey:'style',
-      valueKey: 'itemBorder',
-      value: defContBorder,
-      labelInline: true,
-      className: 'input100',
-      setting: {
-        selected: defContBorder.type,//设置默认选中项
-        isRadio: true,//启用editx默认
-        isDef: true, //启动默认选项
-        //==设置默认值==
-        color: '#fff',
-        width: '0',
-        style: 'solid'
-        //==设置默认值==
-      },
-    },
-    {
-      label: '品牌投影',
-      ele: 'xd-shadow',
-      labelInline: true,
-      groupKey:'style',
-      valueKey: 'itemShadow',
-      value: defContShadow,
-      className: 'input100',
-      setting: {
-        selected: defContShadow.type,
-        isRadio:true,
-        isDef: true,
-        default: {
-          color:'rgba(0,0,0,0.1)',
-          width:'10',
-        }
-      },
-      handleCustom({action, data}) {
-        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-          .then(res => {
-            res.list = res.list.filter(item=>{
-              return item.label !== '无';
-            });
-            data.cb(res.list)
-          })
-          .catch(error => {
-            console.error(error);
-            data.cb([])
-          });
-      },
-    },
-
-
-    //废弃样式（不可删除）
-    {
-      label: '是否有投影:',
-      ele: 'xd-radio',
-      valueKey: 'is_shadow',
-      value: data['is_shadow'] || 'N',
-      placeholder: '请选择是否投影',
-      multiple: false,
-      className: 'input80',
-      groupKey: 'style',
-      hidden:true,
-      list: [
-        {label: '是', value: 'Y'},
-        {label: '否', value: 'N'},
-      ]
-    },
-    {
-      label: '投影颜色:',
-      ele: 'xd-color',
-      valueKey: 'is_shadow_bg',
-      value: data['is_shadow_bg'] || '',
-      placeholder: '请选择投影颜色',
-      classNmae: 'input80',
-      groupKey: 'style',
-      hidden:true,
-    },
-    {
-      label: '投影范围:',
-      ele: 'xd-site-select-list',
-      valueKey: 'is_shadow_w',
-      value: data['is_shadow_w'] || '10',
-      placeholder: '请选择投影范围',
-      multiple: false,
-      hidden:true,
-      groupKey: 'style',
-      className: 'input80',
-      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',
-      valueKey: 'is_border',
-      value: data['is_border'] || 'N',
-      placeholder: '请选择是否有边框',
-      groupKey: 'style',
-      multiple: false,
-      hidden:true,
-      className: 'input80',
-      list: [
-        {label: '是', value: 'Y'},
-        {label: '否', value: 'N'},
-      ]
-    },
-    {
-      label: '边框颜色:',
-      ele: 'xd-color',
-      hidden:true,
-      valueKey: 'is_border_c',
-      value: data['is_border_c'] || '',
-      placeholder: '请选择边框颜色',
-      classNmae: 'input80',
-      groupKey: 'style',
-    },
-    {
-      label: '边框大小:',
-      ele: 'el-input',
-      hidden:true,
-      type: 'number',
-      valueKey: 'is_border_w',
-      value: data['is_border_w'] || '',
-      placeholder: '请输入边框颜色',
-      className: 'input80',
-      groupKey: 'style',
-    },
-    {
-      label: "图标圆角设置：",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "iconRadius",
-      value: data['iconRadius'] === undefined?0:data['iconRadius'],
-      className: "input80",
-      labelInline: true,
-      hidden:true,
-      setting:{
-        min: 0,//最小值
-        max: 100, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      }
-    },
-    {
-      label: "圆角设置：",
-      groupKey: 'style',
-      ele: 'xd-slider',
-      valueKey: "radius",
-      value: data['radius'] === undefined?10:data['radius'],
-      className: "input80",
-      labelInline: true,
-      hidden:true,
-      setting:{
-        min: 0,//最小值
-        max: 150, //最小值
-        step:1, //步长
-        showStops:false,//显示间断点
-        showInput:false,//显示输入框
-      }
-    },
-    //废弃样式（不可删除）
-  ].filter(i=>i)
-}
-