jufubao-mall 2.0.33 → 2.0.35-beta1

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

@@ -0,0 +1,230 @@
+'use strict';
+import {
+  dataVal ,
+  statusShow,
+  statusDataVal,
+  customVal,
+  cusDisabled ,
+  getCustomAttr,
+  isArray,
+  isObject
+} from "@/utils/AttrTools";
+import IConList from "@/ICONS"
+
+export default (data, gValue,gColor,oldData)=>{
+  let categoryParentType = dataVal({data, key:'categoryParentType', dValue:'root', gValue});
+  let navStyle = 'line-6-8-s';
+  if(data['navStyle']) navStyle = data['navStyle'];
+  return[
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "业务线",
+      ele: "xd-choose-namespace",
+      valueKey: "xnamespace",
+      groupKey:'content',
+      placeholder: '请选择业务线',
+      notice:'空继承上级业务线',
+      inline: false,
+      labelInline:true,
+      value:  dataVal({data, key:'xnamespace', dValue:null, gValue}),
+      className: 'input100',
+      handleCustom: (cb) => {
+        XdBus.getParentApi('getOptionsNamespaces')()
+          .then(res => {
+            cb(res.list)
+          })
+          .catch();
+      }
+    },
+    {
+      ele: 'title',
+      label: '组件样式',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: "分类样式",
+      ele: "xd-style-image",
+      groupKey: 'content',
+      valueKey: "navStyle",
+      value: navStyle,
+      labelInline:true,
+      cusStyle:{marginBottom: '0'},
+      className: 'input100',
+      handleCustom(cusRes) {
+        XdBus.getParentApi('getCompStylesOptions')({
+          layout_ids: '5EJjDL8ZCqNePO9Q5ATRH',
+          key: Date.now(),
+          filter: false
+        })
+          .then(res => {
+            cusRes.data.cb(res)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    0&&{
+      label: '分类标签',
+      ele: 'xd-site-select-list',
+      valueKey: 'navMarketTag',
+      value: dataVal({data, key:'navMarketTag', dValue:[], gValue}),
+      placeholder: '请选择分类标签,支持多个',
+      groupKey:'content',
+      labelInline: true,
+      className: 'input100',
+      setting:{multiple: true},
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getBoardOptions')(
+          {server:'product-public',fn:'product',path:'p1'},
+          {key: Date.now(),category_tag:1}
+        )
+          .then(res => {
+            data.cb(res.category_tag || [])
+          })
+          .catch(error => {
+            data.cb([])
+            console.error(error);
+          });
+      },
+    },
+    {
+      label: '父级分类',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'categoryParentType',
+      value: categoryParentType,
+      labelInline:true,
+      className: 'input100',
+      list: [
+        {label: '根目录', value: 'root'},
+        {label: '自定义', value: 'child'},
+      ],
+      notice:'展示指定父级分类下的子级分类',
+      inline: false
+    },
+    {ele: 'group_start'},
+    {
+      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) callback('请输入父级分类ID');
+              else callback()
+            }
+          },
+          message: '请输入父级分类ID',
+          trigger: ['blur', 'change'],
+          required: true,
+        }
+      ],
+    },
+    {ele: 'group_end'},
+    {
+      ele: 'title',
+      label: '展示内容',
+      size: 'small',
+      groupKey:'content',
+    },
+    {
+      label: '底部首页',
+      ele: 'xd-cus-switch',
+      valueKey: 'showIndex',
+      value: data['showIndex'] || 'Y',
+      className: 'input100',
+      labelInline:true,
+      groupKey:'content',
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      ele: "xd-icon-select",
+      valueKey: "showIndexIcon",
+      value: data.showIndexIcon || 'iconshouye1',
+      hidden: data.showIndex !== 'Y',
+      list: IConList,
+      labelInline: true,
+      className: 'input80',
+      groupKey: "content",
+    },
+    {ele: 'group_end'},
+    {
+      label: '立即购买',
+      ele: 'xd-cus-switch',
+      valueKey: 'nowBuy',
+      value: 'Y',
+      disabled: true,
+      className: 'input100',
+      labelInline:true,
+      groupKey:'content',
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'nowBuyText',
+      labelInline:true,
+      value: data['nowBuyText'] || '',
+      hidden: data.nowBuy!=='Y',
+      groupKey:'content',
+      placeholder: '按钮文字，默认“立即充值”',
+      className: 'input80',
+    },
+    {ele: 'group_end'},
+    {
+      label: '划线价',
+      ele: 'xd-cus-switch',
+      valueKey: 'isShowDiscount',
+      value: data['isShowDiscount'] || 'Y',
+      className: 'input100',
+      labelInline:true,
+      groupKey:'content',
+      setting: {
+        isBackType: 'string'
+      },
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'number',
+      valueKey: 'differ',
+      labelInline:true,
+      value: data['differ'] || '',
+      hidden: data.isShowDiscount!=='Y',
+      groupKey:'content',
+      placeholder: '价差，默认值：1',
+      className: 'input80',
+      notice: '划线价取市场价,市场价-售价差值大于等于设置值时展示',
+      inline: false
+    },
+    {ele: 'group_end'},
+
+  ]
+}

package/src/components/JfbMallNetworkMedia/cusAttr/font.js

@@ -0,0 +1,123 @@
+'use strict';
+
+import {dataVal, isObject, statusDataVal, statusShow} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData)=>{
+  let navStyle = 'line-6-8-s';
+  if(data['navStyle']) navStyle = data['navStyle'];
+  return [
+    {
+      ele: 'title',
+      label: '分类-文字区样式',
+      size: 'small',
+      groupKey:'style',
+    },
+    {
+      label: '导航背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'titleBgColorStatus',
+      value: statusDataVal({data, key:'titleBgColorStatus', fields:['titleBgColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      valueKey: 'titleBgColor',
+      groupKey:'style',
+      value: dataVal({data, key:'titleBgColor', dValue:'#fff', gValue}),
+      hidden: !statusShow({data, key: 'titleBgColorStatus', fields:['titleBgColor'], gValue}),
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '导航间距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'fontSpStatus',
+      value: statusDataVal({data, key:'fontSpStatus', fields:['fontSp'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "fontSp",
+      value: dataVal({data, key:'fontSp', dValue:16, gValue}),
+      hidden: !statusShow({data, key: 'fontSpStatus', fields:['fontSp'], gValue}),
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 1,//最小值
+        max: 64, //最小值
+        step:1, //步长
+        showStops:false,//显示间断点
+        showInput:false,//显示输入框
+      },
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '名称样式',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'titleStyleStatus',
+      value: statusDataVal({data, key:'titleStyleStatus', fields:['titleStyle','titleColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey:'style',
+      valueKey: 'titleStyle',
+      value: dataVal({data, key:'titleStyle', dValue:{}, gValue}),
+      hidden: !statusShow({data, key: 'titleStyleStatus', fields:['titleStyle'], gValue}) ,
+      setting: {
+        fontSize: true,
+        weight:true,
+        bgColor: navStyle === 'tags',
+        selected:true,
+        default:{
+          color: '#333',
+          fontSize: '28',
+          bgColor:'#fff',
+          fontWeight:'400',
+          actFontSize: '28',
+          actColor: gColor.mainColor,
+          actFontWeight:'400',
+          actBgColor: '#fff'
+        }
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {ele: 'group_end'},
+
+  ].filter(i=>i)
+}

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

@@ -0,0 +1,257 @@
+'use strict';
+
+import {cRaBorShadow, dataVal, statusDataVal, statusShow} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData)=>{
+  let level2Name = {
+    fontSize: '24',
+    actFontSize: '24',
+    color: '#333',
+    actColor: gColor.mainColor,
+    bgColor:'',
+    actBgColor:'',
+    fontWeight: 'normal',
+    actFontWeight: 'normal',
+    borderStyle:'solid',
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    borderActStyle:'solid',
+    borderActColor: 'rgba(0,0,0,0)',
+    borderActWidth: 0,
+  }
+  let subTitleIconBorder = cRaBorShadow( data, 'subTitleIconBorder', {dValue:'N'},gValue);
+  return [
+    {
+      ele: 'title',
+      label: '分类-图标区样式',
+      size: 'small',
+      groupKey:'style',
+    },
+
+    {
+      label: '导航背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'level2BgcColorStatus',
+      value: statusDataVal({data, key:'level2BgcColorStatus', fields:['level2BgcColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      valueKey: 'level2BgcColor',
+      groupKey:'style',
+      value: dataVal({data, key:'level2BgcColor', dValue:'#fff', gValue}),
+      hidden: !statusShow({data, key: 'level2BgcColorStatus', fields:['level2BgcColor'], gValue}),
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '选中图描边',
+      ele: 'xd-border',
+      groupKey:'style',
+      valueKey: 'subTitleIconBorder',
+      value: subTitleIconBorder,
+      labelInline: true,
+      className: 'input100',
+      setting: {
+        selected: subTitleIconBorder.type,//设置默认选中项
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: gColor.mainColor,
+        width: '2',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
+    {
+      label: '图标圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'subTitleRadiusStatus',
+      value: statusDataVal({data, key:'subTitleRadiusStatus', fields:['subTitleRadius'],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: 'subTitleRadius',
+      value: dataVal({data, key:'subTitleRadius', dValue:'40rpx', gValue}),
+      hidden: !statusShow({data, key: 'subTitleRadiusStatus', fields:['subTitleRadius'], gValue}),
+      placeholder: '请选择图标圆角',
+      multiple: false,
+      className: 'input80',
+      groupKey:'style',
+
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            let list = (res.list || [])
+              .map(item=>{
+                return {
+                  ...item,
+                  value: item.value + 'rpx',
+                }
+              })
+              .filter(item=>{
+                return item.label !== '无'
+              })
+              .concat([{label:'圆角',value: '50%'}]);
+            data.cb(list)
+          })
+          .catch(error => {
+            console.error(error);
+          });
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '图标大小',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'iconWdithStatus',
+      value: statusDataVal({data, key:'iconWdithStatus', fields:['iconWdith'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: "",
+      groupKey: 'style',
+      ele: 'xd-slider',
+      valueKey: "iconWdith",
+      value: dataVal({data, key:'iconWdith', dValue:96, gValue}),
+      hidden: !statusShow({data, key: 'iconWdithStatus', fields:['iconWdith'], gValue}),
+      className: "input80",
+      labelInline: true,
+      setting:{
+        min: 50,//最小值
+        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,//显示输入框
+      },
+    },
+    {ele: 'group_end'},
+    {
+      label: '图标背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'iconBgColorStatus',
+      value: statusDataVal({data, key:'iconBgColorStatus', fields:['iconBgColor'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-color',
+      valueKey: 'iconBgColor',
+      groupKey:'style',
+      value: dataVal({data, key:'iconBgColor', dValue:'#f8f8f8', gValue}),
+      hidden: !statusShow({data, key: 'iconBgColorStatus', fields:['iconBgColor'], gValue}),
+      classNmae: 'input80',
+      setting: {
+        showAlpha: true
+      },
+    },
+    {ele: 'group_end'},
+
+    {
+      label: '名称样式',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'level2NameStatus',
+      value:  statusDataVal({data, key:'level2NameStatus', fields:['level2Name'],gValue}),
+      labelInline:true,
+      list: [
+        {label: '默认', value: 'D'},
+        {label: '自定义', value: 'C'},
+      ]
+    },
+    {ele: 'group_start'},
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey:'style',
+      valueKey: 'level2Name',
+      value:  dataVal({data, key:'level2Name', dValue:'{}', gValue}),
+      hidden: !statusShow({data, key: 'level2NameStatus', fields:['level2Name'], gValue}),
+      setting: {
+        fontSize: true,
+        weight:false,
+        bgColor:true,
+        selected:true,
+        isBorder:false,
+        default: level2Name
+      },
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    {ele: 'group_end'},
+  ].filter(i=>i)
+}

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

@@ -0,0 +1,12 @@
+'use strict';
+
+import font from "./font";
+import icon from "./icon";
+
+export default function (data, gValue, gColor, oldData) {
+  return [
+    ...font(data, gValue, gColor, oldData),
+    ...icon(data, gValue, gColor, oldData),
+  ]
+}
+

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

@@ -284,6 +284,8 @@ export default (data, gValue, gColor, oldData) => {
         type: 'notice', //normal,notice,privacy
         isNew: true,
       },
+      notice: '商品详情里头部显示的固定内容',
+      inline: false,
       handleCustom({ action, data }) {
         if (data && data.params) {
           //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接

package/src/components/JfbMallProductList/JfbMallProductList.vue

@@ -854,7 +854,6 @@
           actFontWeight: 'normal',
         }
         const level2Name = gCPVal(container, 'level2Name', [defNewLvel2Name,defOldLvel2Name],{sKey:'level2NameStatus', fields:['level2Name','level2Color'],isMerge: true});
-        const subTitleRadius = gCPVal(container, 'subTitleRadius', ['40rpx'],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
         const subTitleIconShadow  = gCPVal(container, 'subTitleIconShadow', [this.gStyleValue.shadow,'none'], {isShadow:true});
         const subTitleIconBorder  = gCPVal(container, 'subTitleIconBorder', [{style:'solid', width: '2', color: this.mainColor},'0'], {isBorder:true});
         let navStyle = gCPVal(container, 'navStyle', 'line-6-8-s');
@@ -863,6 +862,13 @@
         const iconImageSp = gCPVal(container, 'iconImageSp', [16],{sKey:'iconImageSpStatus', fields:['iconImageSp']});
         const iconBgColor = gCPVal(container, 'iconBgColor', [100],{sKey:'iconBgColorStatus', fields:['iconBgColor']});
 
+        let defTitleRadius = '50%';
+        if(category === 'v4') {
+          defTitleRadius = 40*Number(iconWdith)/96 + 'rpx';
+        }
+        const subTitleRadius = gCPVal(container, 'subTitleRadius', [defTitleRadius],{sKey:'subTitleRadiusStatus', fields:['subTitleRadius']})||0;
+
+
         this.tabStyle = {
           titleColor,
           titleActColor,

package/src/components/JfbMallProductList/XdCateV1.vue

@@ -334,7 +334,6 @@ export default {
 
   methods: {
     init(navList, pid){
-      debugger
       if(navList.length === 0) return;
 
       //预览模式生效