jufubao-base 1.0.169-beta12 → 1.0.169-beta14

package/package.json

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

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -188,7 +188,7 @@ export default {
         ],
         hidden: data.previewCurrent !== 'ticket',
       },
-      data.inputStyle === 'linear' && {
+      {
         label: "标签文字对齐方式:",
         ele: 'xd-radio',
         valueKey: 'labelAlign',
@@ -215,6 +215,26 @@ export default {
         className: 'input60',
         hidden: data.previewCurrent !== 'ticket',
       },
+      data.inputStyle === 'face' && {
+        label: '面性输入框圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'formBorderRadius',
+        value: data.formBorderRadius ||'',
+        groupKey:'style',
+        placeholder: '请选择边框圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'ticket',
+      },
       {
         label: "标签文字是否显示:",
         ele: 'xd-radio',
@@ -306,6 +326,7 @@ export default {
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
         hidden: data.previewCurrent !== 'ticket',
       },
+      
       {
         label: "票券号码图标:",
         ele: "xd-font",
@@ -557,6 +578,58 @@ export default {
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
         hidden: data.previewCurrent !== 'code',
       },
+      {
+        label: "输入框样式设置",
+        ele: "xd-radio",
+        valueKey: "digitalInputStyle",
+        value: data.digitalInputStyle || 'linear',
+        groupKey:'style',
+        list: [
+          { label: "线性", value: "linear" },
+          { label: "面性", value: "face"}
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      data.digitalInputStyle === 'linear' && {
+        label: "标签位置:",
+        ele: "xd-radio",
+        valueKey: "digitalLabelPosition",
+        value: data.digitalLabelPosition || "left",
+        groupKey:'style',
+        placeholder: "请选择标签对齐方式",
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '居左', value: "left"},
+          {label: '居上', value: "top"},
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      {
+        label: "标签文字对齐方式:",
+        ele: 'xd-radio',
+        valueKey: 'digitalLabelAlign',
+        value: data.digitalLabelAlign || "right",
+        groupKey:'style',
+        placeholder: "请选择标签对齐方式",
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '左对齐', value: "left"},
+          {label: '右对齐', value: "right"},
+          {label: '居中', value: "center"},
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      // {
+      //   label: "电子码标签文案",
+      //   ele: "el-input",
+      //   valueKey: "digitalCodeLabel",
+      //   value: data.digitalCodeLabel || '',
+      //   groupKey:'style',
+      //   type: "string",
+      //   hidden: data.previewCurrent !== 'code',
+      // },
       {
         label: "电子码标签宽度设置",
         ele: "el-input",
@@ -566,15 +639,15 @@ export default {
         type: "number",
         hidden: data.previewCurrent !== 'code',
       },
-      {
-        label: "电子码输入框颜色设置",
+      data.digitalInputStyle === 'linear' && {
+        label: "电子码输入框边框颜色设置",
         ele: "xd-color",
         valueKey: "digitalCodeColor",
-        value: data.digitalCodeColor || "#dddddd",
+        value: data.digitalCodeColor || "#F9F9F9",
         groupKey:'style',
         hidden: data.previewCurrent !== 'code',
       },
-      {
+      data.digitalInputStyle === 'face' && {
         label: '电子码输入框圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'digitalCodeRadius',

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -16,6 +16,7 @@
     <view class="jfb-base-tfk-card-bind__body" :style="{
       '--form-border-color': formBorderColor,
       '--form-border-width': formBorderWidth + 'px',
+      '--form-border-radius': ($rpxNum * Number(formBorderRadius)) + 'px',
       '--form-input-padding': inputPadding + 'px',
       '--label-font-size': ($rpxNum * parseInt(labelFont.fontSize)) + 'px',
       '--label-font-color': labelFont.color,
@@ -128,13 +129,14 @@
       </view>
       <view v-else class="form_wrap" :style="digitalFormStyle">
         <xd-form :key="formRenderKey"
-          label-align="left"
-          labelPosition="left"
+          :label-align="digitalLabelAlign"
+          :labelPosition="digitalLabelPosition"
           :border="true"
           paddingBetween="0"
         >
           <xd-form-item class="form-item digital_item"
-            label=""
+            :class="[digitalInputStyle]"
+            :label="digitalCodeLabel"
             :labelWidth="digitalCodeLabelWidth"
             :leftIcon="digitalCodeIcon.icon"
             :iconColor="digitalCodeIcon.color"
@@ -202,7 +204,9 @@
         tips: "",
         labelWidth: 180,
         labelAlign: "left",
+        digitalLabelAlign: "left",
         labelPosition: "left",
+        digitalLabelPosition: "left",
         inputStyle: "linear",  //输入框样式 linear:线性  face: 面性
         formBorderColor: "#F9F9F9", //
         formBorderWidth: 1, //表单边框宽度
@@ -258,6 +262,9 @@
         digitalCodeColor: "",
         my_card_url: "",
         backUrl: "",
+        digitalInputStyle: "",
+        digitalCodeLabel: "",
+        formBorderRadius: 16,
       }
     },
     computed: {
@@ -424,14 +431,23 @@
         this.digitalCodeLabelWidth = getContainerPropsValue(value, "content.digitalCodeLabelWidth", '100');
         this.digitalCodeRadius = getContainerPropsValue(value, "content.digitalCodeRadius", '0');
         this.digitalCodeColor = getContainerPropsValue(value, "content.digitalCodeColor", '#dddddd');
+        this.digitalInputStyle = getContainerPropsValue(value, "content.digitalInputStyle", 'linear');
         this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
         this.backUrl = getContainerPropsValue(this.container, 'content.back_url', { value: "" }).value;
+        this.digitalLabelPosition = getContainerPropsValue(value, "content.digitalLabelPosition", 'left');
+        this.digitalLabelAlign = getContainerPropsValue(value, "content.digitalLabelAlign", 'left');
+        this.digitalCodeLabel = getContainerPropsValue(value, "content.digitalCodeLabel", '');
+        this.formBorderRadius = getContainerPropsValue(value, "content.formBorderRadius", 16);
 
         console.log(this.digitalCodeRadius, "digitalCodeRadius");
 
         if(this.inputStyle === 'face'){
           this.labelPosition = 'left';
-          this.labelAlign = 'left';
+          // this.labelAlign = 'left';
+        }
+        if(this.digitalInputStyle === 'face'){
+          this.digitalLabelPosition = 'left';
+          // this.digitalLabelAlign = 'left';
         }
         if(this.$configProject.isPreview){
           this.menuType = this.previewCurrent;
@@ -617,6 +633,9 @@
     &__body{
       .form-item {
         ::v-deep &.uni-forms-item {
+          .is-required{
+            display: none;
+          }
           .uni-input-input{
             font-size: var(--content-font-size);
             color: var(--content-font-color);
@@ -638,14 +657,16 @@
         }
         &.linear{
           ::v-deep &.uni-forms-item--border{
-            border-color: var(--form-border-color) !important;
-            border-width: var(--form-border-width) !important;
+            // border-color: var(--form-border-color) !important;
+            // border-width: var(--form-border-width) !important;
+            border-top: none !important;
+            border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
           }
         }
         &.face{
           ::v-deep .uni-forms-item__box{
             background: #F7F7F7;
-            border-radius: 16rpx;
+            border-radius: var(--form-border-radius);
             padding-right: 20rpx;
           }
           ::v-deep &.uni-forms-item--border{
@@ -668,13 +689,23 @@
           }
         }
         &.digital_item{
+          &.linear{
+            ::v-deep &.uni-forms-item--border{
+              border-color: var(--digital-border-color) !important;
+            }
+          }
+          &.face{
+            ::v-deep .uni-forms-item__box{
+              border-radius: var(--digital-border-radius);
+            }
+          }
           ::v-deep .label-icon{
             font-size: var(--digital-icon-size) !important;
           }
           ::v-deep .uni-forms-item__inner{
-            padding-bottom: 0% !important;
-            border: 1px solid var(--digital-border-color);
-            border-radius: var(--digital-border-radius);
+            // padding-bottom: 0% !important;
+            // border: 1px solid var(--digital-border-color);
+            // border-radius: var(--digital-border-radius);
           }
         }
       }

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -333,7 +333,7 @@ export default {
         label: "票券高度",
         ele: "el-input",
         valueKey: 'cardHeight',
-        value: data.cardHeight || 260,
+        value: data.cardHeight || 340,
         type: 'number',
         groupKey:'style',
         placeholder: "请输入票券高度",
@@ -412,6 +412,26 @@ export default {
         value: data.bussTempBgColor || '',
         hidden: data.previewCurrent !== 'main'
       },
+      {
+        label: "业务板块圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'bussTempRadius',
+        value: data['bussTempRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'main'
+      },
       {
         label: "单项业务外边距",
         groupKey:'style',
@@ -498,6 +518,34 @@ export default {
         placeholder: "请输入间隔距离",
         hidden: data.previewCurrent !== 'main'
       },
+      {
+        label: "单项背景色",
+        groupKey:'style',
+        ele: 'xd-color',
+        valueKey: 'listColBgColor',
+        value: data.listColBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'main'
+      },
+      {
+        label: "单项圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'listColRadius',
+        value: data['listColRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'main'
+      },
       {
         label: "提货码详情样式配置",
         ele: 'title',

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -147,7 +147,7 @@
         cardInfoMargin: {},
         cardInfoPadding: {},
         cardImageUrl: "",
-        cardHeight: 260,
+        cardHeight: 340,
         cardRadius: 10,
         bussPadding: {},
         bussMargin: {},
@@ -172,6 +172,9 @@
         codeDetailShadow: {},
         ruleDetailFontColor: "",
         ruleDetailRadius: 0,
+        bussTempRadius: 16,
+        listColBgColor: "",
+        listColRadius: 16,
       }
     },
     computed: {
@@ -204,6 +207,7 @@
           margin: margin,
           padding: padding,
           backgroundColor: this.bussTempBgColor,
+          borderRadius: this.bussTempRadius + 'rpx',
         })
       },
 
@@ -264,6 +268,8 @@
         return this.styleObjectToString({
           padding,
           marginBottom: this.listColSpace + 'rpx',
+          backgroundColor: this.listColBgColor,
+          borderRadius: this.listColRadius + 'rpx',
         })
       },
       ruleDetailBoxStyle(){
@@ -346,7 +352,7 @@
         this.cardInfoMargin = getContainerPropsValue(value, 'content.cardInfoMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardInfoPadding = getContainerPropsValue(value, 'content.cardInfoPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardImageUrl = getContainerPropsValue(value, 'content.cardImageUrl', '');
-        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 260);
+        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 340);
         this.cardRadius = getContainerPropsValue(value, 'content.cardRadius', 16);
         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});
@@ -371,6 +377,9 @@
         this.codeDetailShadow = getContainerPropsValue(value, 'content.codeDetailShadow', {});
         this.ruleDetailFontColor = getContainerPropsValue(value, 'content.ruleDetailFontColor', '');
         this.ruleDetailRadius = getContainerPropsValue(value, 'content.ruleDetailRadius', 0);
+        this.bussTempRadius = getContainerPropsValue(value, 'content.bussTempRadius', 16);
+        this.listColBgColor = getContainerPropsValue(value, 'content.listColBgColor', '#fff');
+        this.listColRadius = getContainerPropsValue(value, 'content.listColRadius', 16);
 
         console.log(this.codeDetailBorder, 'codeDetailBorder')
 
@@ -572,6 +581,7 @@
         flex-direction: column;
         justify-content: space-between;
         font-size: 26rpx;
+        box-sizing: border-box;
         .card_top{
           display: flex;
           flex-direction: column;

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -270,6 +270,31 @@ export default {
           }
         },
       },
+      {
+        label: "显示样式:",
+        ele: 'xd-radio',
+        valueKey: 'noticeStyle',
+        value: data['noticeStyle'] || '1',
+        groupKey:'content',
+        list: [
+          {"label": "静态显示", "value": '1'},
+          {"label": "滚动显示", "value": '2'},
+          {"label": "弹窗显示", "value": '3'},
+        ],
+      },
+      data.noticeStyle == 3 &&{
+        label: '是否隐藏弹框(仅预览模式生效):',
+        ele: 'xd-radio',
+        valueKey: 'notice_is_hide_dailog',
+        groupKey: 'content',
+        value: data['notice_is_hide_dailog'] || 'N',
+        placeholder: '请选择是否隐藏弹框',
+        className: 'input60',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ]
+      },
       {
         ele: "title",
         label: "我的票券包内容配置",
@@ -340,7 +365,7 @@ export default {
         hidden: data.previewCurrent !== 'coupon'
       },
       {
-        label: '顶部菜单配置 - 通用:',
+        label: '顶部菜单配置 - 通用',
         ele: "title",
         size: "small",
         groupKey: "content",
@@ -391,6 +416,18 @@ export default {
         size: "small",
         groupKey: "style",
       },
+      {
+        label: "展示方式设置:",
+        ele: "xd-radio",
+        valueKey: "menuShowType",
+        groupKey:'style',
+        value: data.menuShowType || 'text',
+        className: "input70",
+        list: [
+          {label: '文本', value: 'text'},
+          {label: '按钮', value: 'button'}
+        ],
+      },
       {
         label: '菜单容器内边距设置:',
         groupKey:'style',
@@ -461,7 +498,7 @@ export default {
         type: "number",
       },
       {
-        label: "顶部菜单右侧配置 - 通用:",
+        label: "顶部菜单右侧配置 - 通用",
         ele: "title",
         size: "small",
         groupKey: "style",
@@ -552,6 +589,84 @@ export default {
         size: "small",
         groupKey: "style",
       },
+      // data.noticeStyle === '1' && {
+      //   label: '是否显示标题:',
+      //   ele: 'xd-switch',
+      //   valueKey: 'noticeIsTitle',
+      //   value: data['noticeIsTitle'],
+      //   groupKey:'style',
+      //   list: ['否', '是'],
+      //   backValueType: 2,
+      // },
+      // data.noticeStyle === '1' && data['noticeIsTitle'] && {
+      //   label: '标题对齐方式:',
+      //   ele: 'xd-select-list',
+      //   valueKey: 'noticeTextAlign',
+      //   groupKey:'style',
+      //   className: 'input80',
+      //   value: data['noticeTextAlign'] || '',
+      //   list: [
+      //     {"label": "左", "value": 'left'},
+      //     {"label": "中", "value": 'center'},
+      //     {"label": "右", "value": 'right'},
+      //   ]
+      // },
+      {
+        label: '内容圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'noticeRadius',
+        value: data['noticeRadius'],
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: '内容背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'noticeBgc',
+        groupKey:'style',
+        value: data.noticeBgc || '',
+        placeholder: '请选择内容背景颜色',
+        className: 'input80',
+      },
+      // {
+      //   label: '内文字颜色:',
+      //   ele: 'xd-color',
+      //   groupKey:'style',
+      //   valueKey: 'noticeTextColor',
+      //   value: data.noticeTextColor || '',
+      //   placeholder: '请选择内文字颜色',
+      //   className: 'input80',
+      // },
+      // {
+      //   label: '内容文字大小:',
+      //   ele: 'xd-site-select-list',
+      //   valueKey: 'noticeFontSize',
+      //   value: data['noticeFontSize'],
+      //   groupKey:'style',
+      //   placeholder: '请选择内容文字大小',
+      //   multiple: false,
+      //   className: 'input80',
+      //   handleCustom({action, data}) {
+      //     XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+      //       .then(res => {
+      //         data.cb(res.list)
+      //       })
+      //       .catch(error => {
+      //         console.error(error);
+      //       });
+      //   },
+      // },
       {
         label: "外边距设置:",
         groupKey:'style',
@@ -583,26 +698,51 @@ export default {
         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: false
+      //   }
+      // },
       {
-        label: "背景色设置:",
-        ele: "xd-color",
+        label: "内容字体设置:",
+        ele: "xd-font",
+        valueKey: "noticeFont",
+        value: data.noticeFont || {},
         groupKey:'style',
-        valueKey: "noticeBgColor",
-        value: data.noticeBgColor || null,
         setting: {
-          showAlpha: true,
-          isAlpha: true
-        }
+          align: false,
+          lineHeight: false,
+          weight: 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> 像素',
       },
       {
-        label: "文字设置:",
+        label: "【更多】字体设置:",
         ele: "xd-font",
-        valueKey: "noticeFont",
-        value: data.noticeFont || {},
+        valueKey: "noticeMoreFont",
+        value: data.noticeMoreFont || {},
         groupKey:'style',
         setting: {
           align: false,
           lineHeight: false,
+          weight: false,
         },
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
@@ -617,6 +757,55 @@ export default {
         inline: false,
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
       },
+      {
+        label: '显示条数:',
+        ele: 'el-input',
+        groupKey:'style',
+        type: 'number',
+        valueKey: 'noticeNum',
+        value: data.noticeNum,
+        placeholder: '请输入滚动显示条数，默认：1',
+        className: 'input80',
+        unit: '条'
+      },
+      data.noticeStyle == 2 && {
+        label: '滚动速度值:',
+        ele: 'el-input',
+        type: 'number',
+        groupKey:'style',
+        valueKey: 'noticeSpeed',
+        value: data.noticeSpeed,
+        placeholder: '请输入滚动速度值，默认：20',
+        className: 'input80',
+        inline: false,
+        notice: '滚动速度值，建议取值：20-60， 值越大越快',
+      },
+      // {
+      //   label: '边距设置:',
+      //   ele: 'xd-margin-padding',
+      //   groupKey:'style',
+      //   valueKey: 'noticeScrollMargin',
+      //   value: data.noticeScrollMargin || null,
+      //   setting: {
+      //     type: 'margin',
+      //   },
+      //   placeholder: '请设置内容边距设置',
+      //   inline: false,
+      //   notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：0像素',
+      // },
+      data.noticeStyle == 3 && {
+        label: '弹窗间隔:',
+        ele: 'el-input',
+        type: 'text',
+        groupKey:'style',
+        valueKey: 'noticeTime',
+        value: data.noticeTime || '',
+        className: 'input80',
+        inline: false,
+        notice: '弹窗间隔，单位：小时。默认值：<span style="color: red">3</span>小时',
+      },
+
+
       {
         ele: "title",
         label: "我的票券包样式配置",
@@ -658,7 +847,15 @@ export default {
         groupKey:'style',
         placeholder: '请输入票券高度',
         inline: false,
-        notice: '设置票券高度，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">100</span> 像素',
+        notice: '设置票券高度，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'card'
+      },
+      {
+        label: "票券字体颜色设置:",
+        ele: "xd-color",
+        groupKey:'style',
+        valueKey: "cardFontColor",
+        value: data.cardFontColor || "#333",
         hidden: data.previewCurrent !== 'card'
       },
       {