jufubao-base 1.0.307 → 1.0.309

package/package.json

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

package/src/components/JfbBaseNotice/Attr.js

@@ -424,11 +424,24 @@ export default {
         },
       },
       {
-        label: '内容填充设置:',
+        label: '边距设置:',
         ele: 'xd-margin-padding',
-        valueKey: 'padding',
         groupKey:'style',
-        value: data.padding || null,
+        valueKey: 'margin',
+        value: data.margin || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置内容边距设置',
+        inline: false,
+        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '标题填充设置:',
+        ele: 'xd-margin-padding',
+        valueKey: 'titlePadding',
+        groupKey:'style',
+        value: data.titlePadding || null,
         setting: {
           type: 'padding',
         },
@@ -437,17 +450,17 @@ export default {
         notice: '内容填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        label: '边距设置:',
+        label: '内容填充设置:',
         ele: 'xd-margin-padding',
+        valueKey: 'padding',
         groupKey:'style',
-        valueKey: 'margin',
-        value: data.margin || null,
+        value: data.padding || null,
         setting: {
-          type: 'margin',
+          type: 'padding',
         },
-        placeholder: '请设置内容边距设置',
+        placeholder: '请内容填充设置',
         inline: false,
-        notice: '内容边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        notice: '内容填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
         ele: 'title',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -82,7 +82,7 @@
             >接口无数返回，请检查是否配置成功!</view>
           </template>
           <template v-else>
-            <view :style="{margin:marginUi}">
+            <view :style="{margin:marginComp}">
               <view
                 class="jfb-base-notice__body-title"
                 :style="{
@@ -90,7 +90,7 @@
                   background: bgc,
                   color:textColor,
                   borderRadius: titleRadius,
-                  padding: titlePadding,
+                  padding: titlePaddingComp,
                   borderBottomColor: borderTitleColor,
                   textAlign: textAlign,
                 }"
@@ -102,7 +102,7 @@
                   background: bgc,
                   color:textColor,
                   borderRadius: contRadius,
-                  padding: paddingUi,
+                  padding: paddingComp,
                   lineHeight: '50rpx',
                 }"
                 v-if="content"
@@ -216,10 +216,16 @@
           right: 0
         },
         padding: {
-          top: 8,
-          left: 10,
-          bottom: 8,
-          right: 10
+          top: 20,
+          left: 20,
+          bottom: 20,
+          right: 20
+        },
+        titlePadding:{
+          top: 20,
+          left: 20,
+          bottom: 20,
+          right: 20
         },
         radius: 0, //圆角
         fontSize: 20,
@@ -286,36 +292,21 @@
         if(this.show_tip_icon==='Y') return  this.$xdUniHelper.filterHtml(this.content,'')
         return this.content
       },
-      marginUi() {
-        let str = `${this.checkValue(this.margin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-        return str
+      marginComp() {
+        return this.getMarginAndPadding(this.margin, 0)
       },
-      paddingUi() {
-        let str = `${this.checkValue(this.padding.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 20)}rpx`;
-        return str
+      paddingComp() {
+        return this.getMarginAndPadding(this.padding, 20)
       },
 
       scrollMarginUi(){
-        let str = `${this.checkValue(this.scrollMargin.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.scrollMargin.left, 0)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.scrollMargin, 0)
       },
 
 
-      titlePadding() {
-        let str = `${this.checkValue(this.padding.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.padding.left, 20)}rpx`;
-        return str
+      titlePaddingComp() {
+        debugger
+        return this.getMarginAndPadding(this.titlePadding, 20)
       },
       contRadius(){
         if(this.isTitle) return `0rpx 0rpx ${this.radius}rpx ${this.radius}rpx`;
@@ -354,13 +345,21 @@
         this.time = Number(getContainerPropsValue(container, 'content.time', 3));
         this.textColor = getContainerPropsValue(container, 'content.textColor', this.warningColor);
         this.textAlign = getContainerPropsValue(container, 'content.textAlign', 'left');
+
         this.bgc = getContainerPropsValue(container, 'content.bgc', `rgba(${colorBg.join(',')})`);
-        this.borderTitleColor = Color(this.bgc).lighten(.15).hex();
+        if(Color(this.bgc).isDark()) this.borderTitleColor = Color(this.bgc).lighten(0.9).toString();
+        else if(Color(this.bgc).isLight()) this.borderTitleColor = Color(this.bgc).darken(0.05).toString();
+
+
+
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, bottom: 0, right: 0});
-        this.padding = getContainerPropsValue(container, 'content.padding', {top: 8, left: 10, bottom: 8, right: 10});
-        this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {});
+        this.padding = getContainerPropsValue(container, 'content.padding', {top: 20, left: 20, bottom: 20, right: 20});
+        this.titlePadding = getContainerPropsValue(container, 'content.titlePadding', {top: 20, left: 20, bottom: 20, right: 20});
+        this.scrollMargin =  getContainerPropsValue(container, 'content.scrollMargin', {top: 0, left: 0, bottom: 0, right: 0});
+        debugger
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.fontSize = Number(getContainerPropsValue(container, 'content.fontSize', '20'));
+        this.titleFontSize = this.fontSize * 1.2;
         this.btnConfirmWidth = getContainerPropsValue(container, 'content.btnConfirmWidth', '');
         this.btnConfirmBgColor = getContainerPropsValue(container, 'content.btnConfirmBgColor', '');
         this.btnConfirmTextColor = getContainerPropsValue(container, 'content.btnConfirmTextColor', '');
@@ -368,12 +367,13 @@
         let staticTipIcon = getContainerPropsValue(container, 'content.staticTipIcon', '');
         this.staticTipIcon = staticTipIcon ? getServiceUrl(staticTipIcon.url) : '';
         this.tipIconHeight = getContainerPropsValue(container, 'content.tipIconHeight', 50);
+
+
         if (this.fontSize === 20) this.titleFontSize = 28;
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
 
-
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
           //#ifdef H5