jufubao-base 1.0.169-beta3 → 1.0.169-beta5

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -19,7 +19,7 @@ export default {
         ],
       },
       {
-        label: "温馨提示文案:",
+        label: "温馨提示文案 - 通用:",
         ele: "xd-tinymce",
         valueKey: "tips",
         value: data.tips || null,
@@ -27,7 +27,7 @@ export default {
       },
       {
         ele: "title",
-        label: "标题菜单配置",
+        label: "标题菜单配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -104,6 +104,7 @@ export default {
         label: "实体券表单样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: '表单容器设外边距:',
@@ -117,6 +118,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "输入框样式:",
@@ -130,7 +132,8 @@ export default {
         list: [
           {label: '线性', value: "linear"},
           {label: '面性', value: "face"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "表单边框颜色:",
@@ -139,6 +142,7 @@ export default {
         value: data.formBorderColor || "#F9F9F9",
         groupKey:'style',
         placeholder: "请选择表单边框颜色",
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "表单边框宽度:",
@@ -149,6 +153,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入表单边框宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "输入框间隔距离:",
@@ -159,12 +164,14 @@ export default {
         type: "number",
         placeholder: "请输入输入框间隔距离",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
         label: '实体券标签样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "标签位置:",
@@ -178,7 +185,8 @@ export default {
         list: [
           {label: '居左', value: "left"},
           {label: '居上', value: "top"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.inputStyle === 'linear' && {
         label: "标签文字对齐方式:",
@@ -193,7 +201,8 @@ export default {
           {label: '左对齐', value: "left"},
           {label: '右对齐', value: "right"},
           {label: '居中', value: "center"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "标签宽度:",
@@ -204,6 +213,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入标签宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "标签文字是否显示:",
@@ -217,7 +227,8 @@ export default {
         list: [
           {label: '显示', value: "Y"},
           {label: '不显示', value: "N"},
-        ]
+        ],
+        hidden: data.previewCurrent !== 'ticket',
       },
       data.labelShow === 'Y' && {
         label: "标签字体样式设置:",
@@ -241,6 +252,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "占位符字体样式设置:",
@@ -268,6 +280,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "内容字体样式设置:",
@@ -291,6 +304,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "票券号码图标:",
@@ -316,6 +330,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "票券密码图标:",
@@ -341,6 +356,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "验证码图标:",
@@ -366,12 +382,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
         label: '表单右侧图标',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         label: "扫码图标:",
@@ -397,6 +415,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
         ele: 'title',
@@ -421,9 +440,10 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'ticket',
       },
       {
-        label: "按钮圆角",
+        label: "按钮圆角 - 通用",
         ele: 'xd-site-select-list',
         valueKey: 'btnRadius',
         value: data['btnRadius'] || '',
@@ -442,7 +462,7 @@ export default {
         },
       },
       {
-        label: "按钮图标设置",
+        label: "按钮图标设置 - 通用",
         ele: "xd-font",
         valueKey: "btnIcon",
         value: data.btnIcon || {},
@@ -471,6 +491,7 @@ export default {
         label: '电子码表单样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码表单外边距设置",
@@ -489,6 +510,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码按钮边距设置",
@@ -507,6 +529,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码票券号图标设置",
@@ -532,6 +555,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码标签宽度设置",
@@ -540,6 +564,7 @@ export default {
         value: data.digitalCodeLabelWidth || 100,
         groupKey:'style',
         type: "number",
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: "电子码输入框颜色设置",
@@ -547,6 +572,7 @@ export default {
         valueKey: "digitalCodeColor",
         value: data.digitalCodeColor || "#dddddd",
         groupKey:'style',
+        hidden: data.previewCurrent !== 'code',
       },
       {
         label: '电子码输入框圆角设置:',
@@ -566,10 +592,11 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'code',
       },
       {
         ele: 'title',
-        label: '温馨提示样式配置',
+        label: '温馨提示样式配置 - 通用',
         size: 'small',
         groupKey: 'style',
       },

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -139,7 +139,7 @@
             :iconColor="digitalCodeIcon.color"
             content-align="left"
           >
-            <xd-form-input placeholder="请输入票券号" v-model="form.code" />
+            <xd-form-input prefixIcon="1" placeholder="请输入票券号" v-model="form.code" />
           </xd-form-item>
         </xd-form>
         <view :style="digitalBtnWrapStyle">

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -29,6 +29,7 @@ export default {
           { label: "隐藏业务线", value: "N" },
           { label: "展示业务线", value: "Y" }
         ],
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: '票券背景图:',
@@ -49,6 +50,7 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券使用规则",
@@ -279,6 +281,7 @@ export default {
         ele: "title",
         size: "small",
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "字体颜色",
@@ -286,6 +289,7 @@ export default {
         valueKey: 'cardFontColor',
         value: data.cardFontColor || '#303133',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "外边距设置",
@@ -304,6 +308,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "内边距设置",
@@ -322,6 +327,7 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券高度",
@@ -331,6 +337,7 @@ export default {
         type: 'number',
         groupKey:'style',
         placeholder: "请输入票券高度",
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券圆角",
@@ -350,12 +357,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块样式配置",
         ele: 'title',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块外边距",
@@ -374,6 +383,7 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块容器内边距",
@@ -392,13 +402,15 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块背景色",
         groupKey:'style',
         ele: 'xd-color',
         valueKey: 'bussTempBgColor',
-        value: data.bussTempBgColor || '#ffffff',
+        value: data.bussTempBgColor || '',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项业务外边距",
@@ -417,6 +429,7 @@ export default {
         placeholder: '请设置外边距',
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main' || data.showBusinessList !== 'Y'
       },
       {
         label: "单项业务宽度",
@@ -427,12 +440,14 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入单项业务宽度",
+        hidden: data.previewCurrent !== 'main' || data.showBusinessList !== 'Y'
       },
       {
         label: "使用规则、提货码样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "外边距",
@@ -451,6 +466,7 @@ export default {
         placeholder: '请设置外边距',
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项内边距",
@@ -468,7 +484,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。'
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项间隔距离",
@@ -479,12 +496,14 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入间隔距离",
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "提货码详情样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情外边距",
@@ -502,7 +521,8 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情内边距",
@@ -520,7 +540,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情背景色",
@@ -528,6 +549,7 @@ export default {
         ele: 'xd-color',
         valueKey: 'codeDetailBgColor',
         value: data.codeDetailBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "二维码长宽设置",
@@ -538,6 +560,7 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入二维码长宽",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "向商家付款前置图标配置",
@@ -548,6 +571,7 @@ export default {
         type: "text",
         className: 'input70',
         placeholder: "请输入图标代码",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "刷新二维码图标配置",
@@ -558,12 +582,14 @@ export default {
         type: "text",
         className: 'input70',
         placeholder: "请输入图标代码",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "规则详情样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情外边距",
@@ -581,7 +607,8 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情内边距",
@@ -599,7 +626,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情背景色",
@@ -607,6 +635,7 @@ export default {
         ele: 'xd-color',
         valueKey: 'ruleDetailBgColor',
         value: data.ruleDetailBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'rule'
       }
     ].filter(i=>i)
   },

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -323,7 +323,7 @@
         this.bussPadding = getContainerPropsValue(value, 'content.bussPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.bussMargin = getContainerPropsValue(value, 'content.bussMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.bussTempMargin = getContainerPropsValue(value, 'content.bussTempMargin', {top: 20, left: 20, right: 20, bottom: 20});
-        this.bussTempBgColor = getContainerPropsValue(value, 'content.bussTempBgColor', '#fff');
+        this.bussTempBgColor = getContainerPropsValue(value, 'content.bussTempBgColor', 'transparent');
         this.listColMargin = getContainerPropsValue(value, 'content.listColMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.listColPadding = getContainerPropsValue(value, 'content.listColPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.listColSpace = getContainerPropsValue(value, 'content.listColSpace', 10);