jufubao-base 1.0.197-beta4 → 1.0.197-beta7

package/src/components/JfbBaseUserCenter/JfbBaseUserCenter.vue

@@ -17,17 +17,28 @@
       <view class="x-line"></view>
       <view class="user-center-box" :style="{padding: outMargin}">
         <view :style="{borderRadius: bodyRadius + 'rpx', backgroundColor:bodyBackgroundColor, padding:outPadding}">
-        <view class="my-card-add__btn">
-          <view :style="{color: cardNameColor}">我的{{cardName}}</view>
-          <view :style="{borderColor:btnBoxColor || mainColor,color:btnBoxColor || mainColor}" @click="handleToLink(add_url)">添加{{cardName}}</view>
+        <view class="my-card-add__btn" :style="[titleMarginComp]">
+          <view :style="[titleStyleComp]">我的{{cardName}}</view>
+          <view class="addBtn" :style="[addBtnStyleComp]" @click="handleToLink(add_url)">
+            <text>添加{{cardName}}</text>
+            <view v-if="isShowICONBtn === 'Y'">
+              <xd-font-icon
+                icon="iconxiangyou_xian"
+                :color="addBtnStyleComp.color"
+                :size="20"
+              ></xd-font-icon>
+            </view>
+          </view>
         </view>
         <view
           class="my-card-add__link"
           :style="{
             borderRadius: radius + 'rpx',
             background: backgroundColor,
-            border: borderBox,
-            marginTop: padding + 'rpx'
+            border: borderBoxComp,
+            marginTop: rowSpacing + 'rpx',
+            padding:contentPaddingComp,
+            boxShadow: contShadow
           }"
         >
           <view class="my-card-add__link-num" v-if="0">
@@ -42,7 +53,8 @@
             :style="{
               color:btnTextColor,
               background:btnBgColor,
-              fontSize: btnFontSize + 'rpx'
+              fontSize: btnFontSize + 'rpx',
+              borderRadius:btnRadius + 'rpx',
             }"
             @click="handleToLink(card_url)"
           >
@@ -71,23 +83,68 @@
     },
     mixins: [componentsMixins,extsMixins,JfbBaseUserCenterMixin],
     computed: {
+      titleMarginComp(){
+        return {
+          padding: this.getMarginAndPadding(this.titleMargin, 0),
+        }
+      },
       outPadding() {
-        let str = `${this.checkValue(this.bodyPadding.top, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.right, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.bottom, 0)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyPadding.left, 0)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.bodyPadding,0)
       },
       outMargin() {
-        let str = `${this.checkValue(this.bodyMargin.top, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.right, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.bottom, 20)}rpx`;
-        str = `${str} ${this.checkValue(this.bodyMargin.left, 20)}rpx`;
-        return str
+        return this.getMarginAndPadding(this.bodyMargin, 20)
+      },
+      borderBoxComp() {
+        return this.getBorderCompatibleOldStyle(this.contBorder, {
+          color: this.is_border_c,
+          width: this.is_border_w,
+          type: this.is_border,
+          style: 'solid'
+        })
       },
-      borderBox() {
-        if (this.is_border === 'Y') return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-        else return '0';
+      titleStyleComp(){
+        return {
+          fontSize: this.titleStyle.fontSize || '28rpx',
+          color: `${this.titleStyle.color || '#333'}`,
+          fontWeight: `${this.titleStyle.fontWeight || 'normal'}`,
+        }
+      },
+      addBtnStyleComp(){
+        let border = {};
+        if(this.addBtnBorder && this.addBtnBorder.type === 'Y') {
+          let value = this.addBtnBorder.value ||{};
+          if(value.width) border['borderWidth'] = value.width + 'rpx';
+          if(value.color) border['borderColor'] = value.color;
+          if(value.style) border['borderStyle'] = value.style;
+        }
+        if(this.addBtnBorder && this.addBtnBorder.type === 'N') {
+          border['borderWidth'] = 0;
+          border['borderColor'] = '';
+          border['borderStyle'] = ''
+        }
+
+        let addBtnShadow = {};
+        if(this.addBtnShadow && this.addBtnShadow.type === 'Y') {
+          let value = this.addBtnShadow.value || {};
+          if(value.color && value.width) {
+            addBtnShadow['boxShadow'] = `0 0 ${value.width}rpx ${value.color}`
+          }
+        }
+        return {
+          color: this.addBtnStyle.color || this.mainColor,
+          fontSize: this.addBtnStyle.fontSize || '26rpx',
+          fontWeight: this.addBtnStyle.fontWeight || 'normal',
+          borderColor: this.mainColor,
+          borderWidth: '2rpx',
+          borderStyle:'solid',
+          backgroundColor: this.addBtnBgColor || 'rgba(0,0,0,0)',
+          borderRadius:this.addBtnRadius + 'rpx',
+          ...border,
+          ...addBtnShadow
+        }
+      },
+      contentPaddingComp(){
+        return this.getMarginAndPadding(this.contentPadding, 40)
       },
     },
     data() {
@@ -95,29 +152,43 @@
         add_url: '',
         pwd_url: '',
         card_url:'',
-        cardName: '',
+        cardName: '卡券',
+        bodyPadding: {},
+        bodyRadius: 0,
+        bodyBackgroundColor: 'rgba(0,0,0,0)',
+        bodyMargin:{},
+        rowSpacing: 20,
+
+        //title
+        titleStyle:{},
+        titleMargin:{},
 
-        //基础
-        color: '#333',
+        //添加按钮
+        addBtnBgColor:'rgba(0,0,0,0)',
+        addBtnStyle:{},
+        addBtnBorder:{},
+        addBtnShadow:{},
+        addBtnRadius: '40',
+        isShowICONBtn:'N',
+
+        //进入
+        contentPadding:{},
         backgroundColor: 'rgba(0,0,0,0)',
         radius: 0,
-        padding: 20,
+        contShadow:'0 0 0 rgba(0,0,0,0)',
+
+        //进入按钮样式
         btnBgColor: '',
         btnTextColor: '',
         btnFontSize: 24,
+        btnRadius:'40',
 
         //边框
+        contBorder:{},
         is_border: 'Y',
         is_border_w: 0,
         is_border_c: '',
 
-        //整体
-        bodyPadding: {},
-        bodyRadius: 0,
-        bodyBackgroundColor: 'rgba(0,0,0,0)',
-        bodyMargin:{},
-        cardNameColor: '#333',
-        btnBoxColor:'',
       }
     },
     watch: {
@@ -131,6 +202,7 @@
     },
     methods: {
       handleToLink(path, type) {
+        if (this.$configProject['isPreview']) return;
         if(!path) {
           console.warn(`跳转地址不存在`)
         }
@@ -144,33 +216,48 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //整体
+        this.cardName = getContainerPropsValue(container, 'content.cardName', '卡券');
         this.bodyMargin = getContainerPropsValue(container, 'content.bodyMargin', {});
         this.bodyRadius = getContainerPropsValue(container, 'content.bodyRadius', 0);
         this.bodyBackgroundColor = getContainerPropsValue(container, 'content.bodyBackgroundColor', 'rgba(0,0,0,0)');
         this.bodyPadding = getContainerPropsValue(container, 'content.bodyPadding', {});
+        this.rowSpacing = getContainerPropsValue(container, 'content.padding', 20);
+
+        //标题
+        this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
+        this.titleMargin = getContainerPropsValue(container, 'content.titleMargin', {})
 
-        //基础
+        //添加按钮
+        this.addBtnBgColor = getContainerPropsValue(container, 'content.addBtnBgColor', 'rgba(0,0,0,0)');
+        this.addBtnStyle = getContainerPropsValue(container, 'content.addBtnStyle', {});
+        this.addBtnBorder = getContainerPropsValue(container, 'content.addBtnBorder', {});
+        this.addBtnRadius = getContainerPropsValue(container, 'content.addBtnRadius', '40');
+        this.addBtnShadow =  getContainerPropsValue(container, 'content.addBtnShadow', {});
+        this.isShowICONBtn = getContainerPropsValue(container, 'content.isShowICONBtn', 'N')
+
+        //进入
+        this.contentPadding = getContainerPropsValue(container, 'content.contentPadding', {});
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.color = getContainerPropsValue(container, 'content.textColor', '#333');
         this.backgroundColor = getContainerPropsValue(container, 'content.backgroundColor', '#f8f8f8');
-        this.padding = getContainerPropsValue(container, 'content.padding', 20);
-        this.btnBgColor = getContainerPropsValue(container, 'content.btnBgColor', this.mainGradient);
+        this.contShadow = this.getXdShadow({width:20, color:'rgba(0,0,0,0)'},getContainerPropsValue(container, 'content.contShadow', {}))
+
+        //进入按钮
+        this.btnBgColor = getContainerPropsValue(container, 'content.btnBgColor', this.mainGradient||this.mainColor);
         this.btnTextColor = getContainerPropsValue(container, 'content.btnTextColor', '#fff');
         this.btnFontSize = getContainerPropsValue(container, 'content.btnFontSize',26);
-        this.cardNameColor = getContainerPropsValue(container, 'content.cardNameColor','#333');
-        this.btnBoxColor = getContainerPropsValue(container, 'content.cardNameColor','');
+        this.btnRadius =  getContainerPropsValue(container, 'content.btnRadius','40');
+
+        //边框兼容
+        this.contBorder = getContainerPropsValue(container, 'content.contBorder', {});
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 2);
 
-        //其他
+        //链接
         this.add_url = getContainerPropsValue(container, 'content.add_url', {value: ''}).value;
         this.pwd_url = getContainerPropsValue(container, 'content.pwd_url', {value: ''}).value;
         this.card_url = getContainerPropsValue(container, 'content.card_url', {value: ''}).value;
-        this.cardName = getContainerPropsValue(container, 'content.cardName', '卡券');
-
       },
     }
   }
@@ -182,7 +269,15 @@
 
   .jfb-base-user-center {
     &__body{
+      & .addBtn {
+        display: flex;
+        justify-content: center;
+        align-items: center;
 
+        & > view {
+          margin-left: 10rpx;
+        }
+      }
     }
   }
 
@@ -197,9 +292,6 @@
         width: unit(200, rpx);
         height: unit(60, rpx);
         line-height: unit(60, rpx);
-        border-radius: unit(30, rpx);
-        border: 1px solid #FF5733;
-        color: #FF5733;
         text-align: center;
       }
     }
@@ -235,7 +327,6 @@
         height: unit(80, rpx);
         line-height: unit(80, rpx);
         border-radius: unit(100, rpx);
-        font-size: unit(24, rpx);
         text-align: center;
         margin-top: unit(30, rpx);
       }