jufubao-mall 2.0.35-beta8 → 2.0.35-beta91

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

@@ -43,6 +43,8 @@ export default function (data, gValue, gColor, oldData){
       placeholder: '请选择服务类型',
       className: 'input100',
       groupKey:'content',
+      notice:' 更换服务类型时，请注意修改高级配置中对应的跳转地址',
+      inline: false,
       rules: [
         {required: true, message: '请选择服务类型', trigger: ['blur', 'change']}
       ],
@@ -54,7 +56,7 @@ export default function (data, gValue, gColor, oldData){
           server:'supplier-partner',
           fn:'shop',
           path:'p1',
-        }, {consume_mode: 2})
+        }, {cusume_mode: 1})
           .then(res => {
             data.cb(res['consume_mode'])
           })
@@ -63,6 +65,8 @@ export default function (data, gValue, gColor, oldData){
           });
       },
     },
+
+
     0&&{
       label: '标签切换下划线样式:',
       ele: 'xd-radio',
@@ -79,7 +83,7 @@ export default function (data, gValue, gColor, oldData){
         {"label": "细线(短)", "value": "smallLineShort"},
       ]
     },
-    0&&{
+    {
       ele: 'title',
       label: '组件样式',
       size: 'small',
@@ -106,7 +110,7 @@ export default function (data, gValue, gColor, oldData){
           });
       },
     },
-    0&&{
+    {
       label: "门店样式",
       ele: "xd-style-image",
       groupKey: 'content',
@@ -134,7 +138,7 @@ export default function (data, gValue, gColor, oldData){
           });
       },
     },
-    0&&{
+    {
       label: "选项样式",
       ele: "xd-style-image",
       groupKey: 'content',
@@ -162,17 +166,18 @@ export default function (data, gValue, gColor, oldData){
           });
       },
     },
-    0&&{
+    {
       label: "展示内容",
       ele: "title",
       groupKey: "content",
       size: "small",
     },
-    0&&{
+
+    {
       label: '常用门店',
       ele: 'xd-cus-switch',
       valueKey: 'showOftenTab',
-      value: 'N',//dataVal({data, key:'showOftenTab', dValue:'N', gValue}),
+      value: dataVal({data, key:'showOftenTab', dValue:'N', gValue}),
       isRefresh: true,
       className: 'input100',
       groupKey:'content',
@@ -182,11 +187,11 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{
+    {
       ele:'xd-line',
       groupKey:'content'
     },
-    0&&{
+    {
       label: '门店图片',
       ele: 'xd-cus-switch',
       valueKey: 'showStoreImg',
@@ -200,11 +205,11 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{
+    {
       ele:'xd-line',
       groupKey:'content'
     },
-    0&&{
+    {
       label: '门店地址',
       ele: 'xd-cus-switch',
       valueKey: 'showStoreAddress',
@@ -218,11 +223,11 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{
+    {
       ele:'xd-line',
       groupKey:'content'
     },
-    0&&{
+    {
       label: '距离',
       ele: 'xd-cus-switch',
       valueKey: 'showStoreDistance',
@@ -235,11 +240,11 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{
+    {
       ele:'xd-line',
       groupKey:'content'
     },
-    0&&{
+    {
       label: '折扣/价格',
       ele: 'xd-cus-switch',
       valueKey: 'showStorePrice',
@@ -254,8 +259,8 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{ele: 'group_start'},
-    0&&{
+    {ele: 'group_start'},
+    {
       label: "全部选项",
       ele: "xd-radio",
       groupKey: "content",
@@ -269,12 +274,12 @@ export default function (data, gValue, gColor, oldData){
       labelInline: true,
       indent: true
     },
-    0&&{ele: 'group_end'},
-    0&&{
+    {ele: 'group_end'},
+    {
       ele:'xd-line',
       groupKey:'content'
     },
-    0&&{
+    {
       label: '快捷入口',
       ele: 'xd-cus-switch',
       valueKey: 'fastEntryStatus',
@@ -287,8 +292,8 @@ export default function (data, gValue, gColor, oldData){
         isBackType: 'string'
       },
     },
-    0&&{ele: 'group_start'},
-    0&&{
+    {ele: 'group_start'},
+    {
       label: '',
       ele: 'xd-name-check',
       valueKey: 'fastEntry',
@@ -296,23 +301,21 @@ export default function (data, gValue, gColor, oldData){
       value: dataVal({data, key:'fastEntry', dValue:[], gValue}),
       className: 'input100',
       setting: {
-        isSort:true,
-        width: 90,
+        isSort:false,
+        width: 100,
       },
       labelInline:true,
       hidden: data['fastEntryStatus'] !== 'Y',
       handleCustom({action, data}) {
         data.cb([
-          {value:'jhd', label: '聚好兑', input:'',def:'聚好兑', check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'wb', label: '扫一扫',input:'',def:'扫一扫',check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'qp', label: '快捷码',input:'',def:'去提货',check: false,placeholder:'服务类型为支持核销时使用'},
-          {value:'seat', label: '在线选座',input:'',def:'去购票',check: false,placeholder:''},
-          {value:'code', label: '电子码',input:'',def:'电子码',check: false,placeholder:''},
-          {value:'hdSelf', label: '到店自取',input:'',def:'去下单',check: false,placeholder:'服务类型为小时达到店时使用'},
-          {value:'travel', label: '旅游门票',input:'',def:'去购票',check: false,placeholder:''}
+          {value:'cashier', label: '支持核销',input:'',check: false,placeholder:'支持核销名称，默认“去买单”'},
+          {value:'buyTicket', label: '在线选座',input:'',check: false,placeholder:'在线选座名称，默认“去购票”'},
+          {value:'code', label: '电子码门店',input:'',check: false,placeholder:'电子码门店称，默认“电子码”'},
+          {value:'hdSelf', label: '小时达到店',input:'',check: false,placeholder:'小时达到店名称，默认“到店自取”'},
+          {value:'travel', label: '旅游门票',input:'',check: false,placeholder:'旅游门票名称，默认“去购票”'}
         ])
       },
     },
-    0&&{ele: 'group_end'},
+    {ele: 'group_end'},
   ].filter(i=>i)
 }

package/src/components/JfbMallShopVip/cusAttr/shops.js

@@ -40,7 +40,7 @@ export default function (data, gValue, gColor, oldData) {
       value: dataVal({
         data,
         key:'itemPadding',
-        dValue:[gValue.isAdd && gValue.isFirst ?{top:32,left:32, right:32, bottom:32}:20],
+        dValue:[gValue.isAdd && gValue.isFirst ?{top:16,left:16, right:16, bottom:16}:20],
         gValue,
         isPM: true,
       }),
@@ -63,7 +63,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '',
+      label: '颜色',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'cardItemBgColor',
@@ -79,7 +79,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_end'},
     {
-      label: '行间距',
+      label: '间距设置',
       ele: 'xd-radio',
       groupKey: 'style',
       valueKey: 'cardItemSpaceStatus',
@@ -124,7 +124,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '',
+      label: '大小',
       ele: 'xd-site-select-list',
       labelInline: true,
       valueKey: 'cardItemRadius',
@@ -201,6 +201,66 @@ export default function (data, gValue, gColor, oldData) {
       },
     },
 
+    {
+      label: '图片圆角',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'itemImageRadiusStatus',
+      value: statusDataVal({data, key:'itemImageRadiusStatus', cValue:'N', fields:['itemImageRadius'],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: 'itemImageRadius',
+      value: dataVal({data, key:'itemImageRadius', dValue:['10'], gValue}),
+      hidden: !statusShow({data, key: 'itemImageRadiusStatus', fields:['itemImageRadius'], gValue}),
+      placeholder: '请选择圆角',
+      multiple: false,
+      className: 'input40',
+      groupKey:'style',
+      handleCustom({action, data}) {
+        XdBus.getParentApi('getOptionsSettingList')({
+          setting_id: 'edtix_style_radius',
+          key: Date.now()
+        })
+          .then(res => {
+            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',
+      labelInline: true,
+      groupKey:'style',
+      valueKey: 'cardImageBorder',
+      value: defCardImageBorder,
+      setting: {
+        selected:defCardImageBorder.type,
+        isRadio: true,//启用editx默认
+        isDef: true, //启动默认选项
+        //==设置默认值==
+        color: '#f8f8f8',
+        width: '2',
+        style: 'solid'
+        //==设置默认值==
+      },
+    },
     {
       label: "背景颜色:",
       ele: "xd-color",
@@ -223,7 +283,7 @@ export default function (data, gValue, gColor, oldData) {
     },
     {ele: 'group_start'},
     {
-      label: '',
+      label: '文字颜色',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'distanceColor',

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

@@ -7,6 +7,7 @@ import {
 } from "@/utils/AttrTools";
 
 import shops from "./shops";
+import tab from "./tab";
 
 export default function (data, gValue,gColor,oldData){
   return [
@@ -61,7 +62,7 @@ export default function (data, gValue,gColor,oldData){
     },
     {ele: 'group_start'},
     {
-      label: '',
+      label: '颜色',
       ele: 'xd-color',
       groupKey:'style',
       valueKey: 'contentBgColor',
@@ -76,6 +77,7 @@ export default function (data, gValue,gColor,oldData){
       inline: false,
     },
     {ele: 'group_end'},
+    ...tab(data, gValue,gColor,oldData),
     ...shops(data, gValue,gColor,oldData),
 
   ].filter(i=>i)