jufubao-base 1.0.169-beta3 → 1.0.169-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.169-beta3",
+  "version": "1.0.169-beta4",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseLogin/Attr.js

@@ -29,6 +29,7 @@ export default {
         value: data.authLoginBtnText ||"",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "授权登录按钮前缀图标:",
@@ -37,6 +38,7 @@ export default {
         value: data.authLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "账号登录按钮文案:",
@@ -45,6 +47,7 @@ export default {
         value: data.accountLoginBtnText ||"",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "账号登录按钮前缀图标:",
@@ -53,6 +56,7 @@ export default {
         value: data.accountLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "手机号登录按钮文案:",
@@ -61,6 +65,7 @@ export default {
         value: data.phoneLoginBtnText || "登录",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号登录按钮前缀图标:",
@@ -69,10 +74,11 @@ export default {
         value: data.phoneLoginBtnIcon || "",
         groupKey: "content",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
-        label: '协议内容配置',
+        label: '协议内容配置 - 通用',
         size: 'small',
         groupKey: 'content',
       },
@@ -544,6 +550,7 @@ export default {
         label: '账号登录内容配置',
         size: 'small',
         groupKey: 'content',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号自定义提示语:",
@@ -553,6 +560,7 @@ export default {
         groupKey:'content',
         placeholder: "请输入手机号自定义提示语",
         className: 'input80',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "验证码自定义提示语:",
@@ -562,6 +570,13 @@ export default {
         groupKey:'content',
         placeholder: "请输入验证码自定义提示语",
         className: 'input80',
+        hidden: data.previewCurrent !== "account",
+      },
+      {
+        ele: 'title',
+        label: '其他',
+        size: 'small',
+        groupKey: 'content',
       },
       {
         label: '是否使用体验码功能:',
@@ -582,6 +597,7 @@ export default {
         label: 'logo样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "logo区域高度:",
@@ -592,6 +608,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo区域高度",
         className: 'input60',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: "logo图片高度:",
@@ -602,6 +619,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo图片高度",
         className: 'input60',
+        hidden: data.previewCurrent !== "auth",
       },
       {
         label: 'logo圆角设置:',
@@ -621,12 +639,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== "auth",
       },
       {
         ele: "title",
         label: "表单样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "输入框样式:",
@@ -640,7 +660,8 @@ export default {
         list: [
           {label: '线性', value: "linear"},
           {label: '面性', value: "face"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "表单边框颜色:",
@@ -649,6 +670,7 @@ export default {
         value: data.formBorderColor || "#F9F9F9",
         groupKey:'style',
         placeholder: "请选择表单边框颜色",
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "表单边框宽度:",
@@ -659,6 +681,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入表单边框宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "表单背景颜色:",
@@ -667,6 +690,7 @@ export default {
         value: data.formBgColor || "#FFFFFF",
         groupKey:'style',
         placeholder: "请选择表单背景颜色",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: '表单容器设置内边距:',
@@ -680,12 +704,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '标签样式配置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签文字对齐方式:",
@@ -700,7 +726,8 @@ export default {
           {label: '左对齐', value: "left"},
           {label: '右对齐', value: "right"},
           {label: '居中', value: "center"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签位置:",
@@ -714,7 +741,8 @@ export default {
         list: [
           {label: '居左', value: "left"},
           {label: '居上', value: "top"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       data.inputStyle === 'linear' && {
         label: "标签宽度:",
@@ -725,6 +753,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入标签宽度",
         className: 'input60',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "手机号图标:",
@@ -734,6 +763,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入手机号图标",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "验证码图标:",
@@ -743,6 +773,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入验证码图标",
         className: "input70",
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "标签字体样式设置:",
@@ -753,13 +784,6 @@ export default {
         setting: {
           align: false,
           lineHeight: false,
-          //color:true, //颜色
-          //fontSize: true, //字体大小
-          //style:true, //字体：nomarl|italic
-          //align:true, //左，中，右
-          //weight: true, //粗细
-          //lineHeight: true, //行高
-          //decoration: true, //样式，none |underline ｜line-through | overline
         },
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
@@ -773,12 +797,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '输入框设置',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "占位符字体样式设置:",
@@ -806,6 +832,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "内容字体样式设置:",
@@ -829,12 +856,14 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
         label: '获取验证码',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "获取验证码字体样式设置:",
@@ -862,6 +891,7 @@ export default {
         },
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
         label: "获取验证码展示方式:",
@@ -874,7 +904,8 @@ export default {
         list: [
           {label: '文字', value: 'text'},
           {label: '按钮', value: 'button'},
-        ]
+        ],
+        hidden: data.previewCurrent !== "account",
       },
       {
         ele: 'title',
@@ -908,9 +939,10 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account",
       },
       {
-        label: "按钮圆角",
+        label: "按钮圆角 - 通用",
         ele: 'xd-site-select-list',
         valueKey: 'btnRadius',
         value: data['btnRadius'] || '',
@@ -930,7 +962,7 @@ export default {
       },
       {
         ele: 'title',
-        label: '条款协议',
+        label: '条款协议 - 通用',
         size: 'small',
         groupKey: 'style',
       },
@@ -999,7 +1031,7 @@ export default {
         ]
       },
       {
-        label: "外边距设置:",
+        label: "条款协议外边距设置 - 账号登录",
         groupKey:'style',
         ele: 'xd-margin-padding',
         valueKey: 'agreePadding',
@@ -1015,12 +1047,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account"
       },
       {
         ele: "title",
         label: "授权登录页设置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: "授权登录按钮组边距设置:",
@@ -1034,6 +1068,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: "隐私协议外边距设置:",
@@ -1047,6 +1082,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         ele: 'title',
@@ -1066,7 +1102,8 @@ export default {
         list: [
           {label: '显示', value: "Y"},
           {label: '隐藏', value: "N"},
-        ]
+        ],
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: '站点名称颜色:',
@@ -1076,6 +1113,7 @@ export default {
         groupKey:'style',
         placeholder: '请选择站点名称颜色',
         classNmae: 'input60',
+        hidden: data.previewCurrent !== "auth"
       },
       {
         label: '快速授权失败访问地址:', //label

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);

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -18,6 +18,12 @@ export default {
           { label: '我的优惠券', value: 'coupon' },
         ],
       },
+      {
+        ele: "title",
+        label: "公告内容配置 - 通用",
+        size: "small",
+        groupKey: "content",
+      },
       {
         label: '公告内容:',
         ele: 'xd-site-news',
@@ -247,6 +253,7 @@ export default {
         label: "我的票券包内容配置",
         size: "small",
         groupKey: "content",
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: '票券背景图:',
@@ -267,12 +274,14 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'card'
       },
       {
         ele: "title",
         label: "我的优惠券内容配置",
         size: "small",
         groupKey: "content",
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: '优惠券背景图:',
@@ -293,10 +302,11 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         ele: "title",
-        label: "列表容器配置",
+        label: "列表容器配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -327,7 +337,7 @@ export default {
       },
       {
         ele: "title",
-        label: "标题菜单配置",
+        label: "标题菜单配置 - 通用",
         size: "small",
         groupKey: "style",
       },
@@ -362,7 +372,7 @@ export default {
         groupKey:'style',
         ele: 'el-input',
         valueKey: 'menuItemMargin',
-        value: data.menuItemMargin || 20,
+        value: data.menuItemMargin || 40,
         type: "number",
         className: "input40",
         placeholder: '请输入菜单间距',
@@ -425,11 +435,83 @@ export default {
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
       },
+      {
+        ele: "title",
+        label: "公告样式配置 - 通用",
+        size: "small",
+        groupKey: "style",
+      },
+      {
+        label: "外边距设置:",
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'noticeMargin',
+        value: data.noticeMargin || {
+          top: 20,
+          right: 0,
+          bottom: 20,
+          left:20
+        },
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+      },
+      {
+        label: "内边距设置:",
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'noticePadding',
+        value: data.noticePadding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "背景色设置:",
+        ele: "xd-color",
+        groupKey:'style',
+        valueKey: "noticeBgColor",
+        value: data.noticeBgColor || null,
+        setting: {
+          showAlpha: true,
+          isAlpha: true
+        }
+      },
+      {
+        label: "文字设置:",
+        ele: "xd-font",
+        valueKey: "noticeFont",
+        value: data.noticeFont || {},
+        groupKey:'style',
+        setting: {
+          align: false,
+          lineHeight: false,
+        },
+        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);
+            });
+        },
+        inline: false,
+        notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
+      },
       {
         ele: "title",
         label: "我的票券包样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "单项内边距设置:",
@@ -443,6 +525,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "圆角设置",
@@ -462,6 +545,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮文字背景色设置:",
@@ -485,6 +569,7 @@ export default {
               data.cb([])
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮圆角设置",
@@ -504,6 +589,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'card'
       },
       {
         label: "登录按钮内边距设置:",
@@ -517,12 +603,14 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'card'
       },
       {
         ele: "title",
         label: "我的优惠券样式配置",
         size: "small",
         groupKey: "style",
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "优惠券左侧背景色设置:",
@@ -530,6 +618,7 @@ export default {
         valueKey: "couponLeftBgColor",
         value: data.couponLeftBgColor || 'linear-gradient(180deg, #FFA852 0%, #FF5733 100%)',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "圆角设置",
@@ -549,6 +638,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "优惠券标题背景颜色设置:",
@@ -559,7 +649,8 @@ export default {
         setting: {
           showAlpha: true,
           isAlpha: true
-        }
+        },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "去使用按钮文字背景色设置: ",
@@ -583,6 +674,7 @@ export default {
               data.cb([])
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "按钮内边距设置:",
@@ -596,6 +688,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: "按钮圆角设置",
@@ -615,6 +708,7 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'coupon'
       },
       {
         label: '票券绑定跳转路径:', //label

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -39,17 +39,18 @@
       <view class="JfbBaseNotice">
         <!--notice-->
         <view class="jfb-base-tfk-card-login__body-line" v-if="!notice"></view>
-        <view :style="{marginTop: '0rpx'}" class="jfb-base-tfk-card-login__body-notice" v-if="notice">
+        <view class="jfb-base-tfk-card-login__body-notice" :style="noticeWrapBoxStyle" v-if="notice">
           <view
             class="jfb-base-tfk-card-login__body-notice-in"
-            :style="{ background: noticeBackgroundColor }"
+            :style="noticeBoxStyle"
           >
             <xd-notice-bar
               style="width: 100%"
+              :color="noticeFont.color"
               :showIcon="true"
               :scrollable="true"
               :speed="20"
-              :fontSize="24"
+              :fontSize="noticeFont.size"
               :height="70"
               :is-no-bgc="false"
             >
@@ -59,15 +60,14 @@
             </xd-notice-bar>
           </view>
         </view>
-        <view class="jfb-base-tfk-card-login__body-notice" v-if="noticeStatus && isPreview && notice === ''">
+        <view class="jfb-base-tfk-card-login__body-notice" :style="noticeWrapBoxStyle" v-if="noticeStatus && isPreview && notice === ''">
           <view
             class="jfb-base-tfk-card-login__body-notice-in"
-            :style="{
-              background: noticeBackgroundColor,
+            :style="[noticeBoxStyle, {
               textAlign: 'center',
               color: dangerColor,
               fontSize: 26 + 'rpx',
-            }">该组件未配置数据，因此改模块在正式环境将不显示</view>
+            }]">该组件未配置数据，因此改模块在正式环境将不显示</view>
         </view>
         <!--notice end-->
       </view>
@@ -200,6 +200,10 @@
         couponUseBtnPadding: {},
         couponBtnRadius: 16,
         couponLeftBgColor: "",
+        noticeBgColor: "",
+        noticeMargin: {},
+        noticePadding: {},
+        noticeFont: {},
       }
     },
     computed: {
@@ -348,6 +352,26 @@
           borderRadius: this.couponRadius + 'rpx',
         })
       },
+      noticeWrapBoxStyle(){
+        let padding = `${this.checkValue(this.noticeMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticeMargin.left, 20)}rpx`;
+
+        return this.styleObjectToString({
+          padding: padding,
+        })
+      },
+      noticeBoxStyle(){
+        let padding = `${this.checkValue(this.noticePadding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.noticePadding.left, 20)}rpx`;
+        return this.styleObjectToString({
+          padding: padding,
+          background: this.noticeBgColor
+        })
+      }
     },
     watch: {
       container(value, oldValue) {
@@ -393,8 +417,12 @@
         this.couponUseBtnPadding = getContainerPropsValue(value, "content.couponUseBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
         this.couponBtnRadius = getContainerPropsValue(value, "content.couponBtnRadius", 16);
         this.couponLeftBgColor = getContainerPropsValue(value, "content.couponLeftBgColor", "");
+        this.noticeBgColor = getContainerPropsValue(value, "content.noticeBgColor", "");
+        this.noticeMargin = getContainerPropsValue(value, "content.noticeMargin", {top: 20, left: 20, right: 20, bottom: 20});
+        this.noticePadding = getContainerPropsValue(value, "content.noticePadding", {top: 20, left: 20, right: 20, bottom: 20});
+        this.noticeFont = getContainerPropsValue(value, "content.noticeFont", {});
 
-        console.log(this.couponLeftBgColor, 'couponLeftBgColor')
+        console.log(this.noticeFont, 'noticeFont')
 
         if(this.$configProject.isPreview){
           this.menuType = this.previewCurrent;
@@ -472,19 +500,12 @@
       }
       &-notice {
         width: 100%;
-        margin-top: unit(30, rpx);
-        height: unit(80, rpx);
-        position: relative;
+        box-sizing: border-box;
         &-in {
-          position: absolute;
-          left: unit(-30, rpx);
-          top: unit(0, rpx);
-          right: unit(-30, rpx);
-          bottom: 0;
           display: flex;
-          padding: 0 unit(30, rpx);
           overflow: hidden;
           align-items: center;
+          box-sizing: border-box;
         }
 
       }
@@ -569,7 +590,11 @@
             }
           }
         }
-        .coupon_list{}
+        .coupon_list{
+          ::v-deep .xd-coupon_item{
+            margin: var(--card-list-margin) 0;
+          }
+        }
         .no_more_card{
           text-align: center;
           padding: 20rpx 0;