jufubao-base 1.0.227 → 1.0.228-beta1

package/package.json

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

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -118,30 +118,28 @@
 
     computed: {
       bodyStyle(){
-        let margin = `${this.checkValue(this.margin.top, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.right, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.bottom, 0)}rpx`;
-        margin = `${margin} ${this.checkValue(this.margin.left, 0)}rpx`;
-
-        let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
-        padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
+        let margin = `${this.checkValue(this.margin.top, 20)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.right, 20)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.bottom, 20)}rpx`;
+        margin = `${margin} ${this.checkValue(this.margin.left, 20)}rpx`;
 
         return {
           margin,
-          padding
         }
       },
-
       contStyle(){
         let border = 0;
         if (this.is_border === 'Y') border = `${this.is_border_w}rpx solid ${this.is_border_c}`;
+        let padding = `${this.checkValue(this.padding.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.padding.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.padding.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.padding.left, 20)}rpx`;
         return {
           background: this.backgroundColor,
           borderRadius: this.radius + 'rpx',
           marginBottom: this.rowSpacing + 'rpx',
-          border
+          border,
+          padding
         }
       },
 

package/src/components/JfbBaseSuccess/Attr.js

@@ -319,6 +319,27 @@ export default {
         value: data.btnTextColor || '',
         classNmae: 'input80',
       },
+      {
+        label: '文字大小:',
+        ele: 'xd-site-select-list',
+        valueKey: 'btnTextSize',
+        groupKey:'style',
+        value: data['btnTextSize'] || '',
+        placeholder: '请选择文字大小',
+        multiple: false,
+        className: 'input60',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_font_size'
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
       {
         "label": "自定义按钮跳转地址:",
         "ele": "xd-select-pages-path",

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -116,7 +116,7 @@
                   v-if="info.codes[0].can_read_password"
                   class="jfb-base-success__body-cashier-password"
                   @click="showPassword = true"
-                  :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                  :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                 >{{ showPassword ? info.codes[0].can_read_code : "查看" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
@@ -157,7 +157,7 @@
                     <view
                       class="jfb-base-success__body-num-info-copy"
                       @click="copy(item.code)"
-                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                     >复制</view>
                     <view
                       v-if="item['code_end_time']"
@@ -187,7 +187,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="copy(item.code)"
-                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                       >复制</view>
                     </view>
                     <view
@@ -200,7 +200,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="copy(item.password)"
-                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                       >复制</view>
                       <view
                         v-if="item['code_end_time']"
@@ -227,7 +227,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
-                        :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                        :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                       >查看二维码和{{ item.password_title }}</view>
                       <view
                         v-if="item['code_end_time']"
@@ -254,7 +254,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
-                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                         >查看一维码</view>
                       <view
                         v-if="item['code_end_time']"
@@ -281,13 +281,13 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleToLink(item.code)"
-                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                       >访问</view>
                     </view>
                     <view
                       class="jfb-base-success__body-num-info-copy"
                       @click="copy(item.code)"
-                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor, fontSize: btnTextSize + 'rpx'}"
                     >复制</view>
                     <view
                       v-if="item['code_end_time']"
@@ -432,6 +432,7 @@ export default {
       btnTextColor:'',
       btnBgColor:'',
       btnBorderColor:'',
+      btnTextSize: '',
 
       info: null,
       timeer: null,
@@ -533,7 +534,9 @@ export default {
       this.btnBgColor =  getContainerPropsValue(value, "content.btnBgColor", '#e5e5e5');
       this.btnTextColor =  getContainerPropsValue(value, "content.btnTextColor", '#666');
       this.btnBorderColor = getContainerPropsValue(value, "content.btnBorderColor", 'rgba(0,0,0,0)');
+      this.btnTextSize = getContainerPropsValue(value, "content.btnTextSize", '28');
       this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
+      console.log("this., fontSize: btnTextSize + 'rpx'", this.btnTextSize)
       this.custom_btn_path = getContainerPropsValue(
         value,
         "content.custom_btn_path",

package/src/components/JfbBaseUserInfo/JfbBaseUserInfo.vue

@@ -25,7 +25,7 @@
           :class="{center: textType === 'N',vertical: textType === 'Y'}"
         >
           <template v-if="logined">
-            <image v-if="userInfo['head_url']" :src="userInfo['head_url']"></image>
+            <image v-if="userInfo['head_url']" :style="{border: `1px solid ${imageColor}`, borderRadius:imageRadius}" :src="userInfo['head_url']"></image>
             <view class="no-image" :style="{borderColor: imageColor, borderRadius:imageRadius}" v-else>
               <xd-font-icon :color="imageColor" icon="iconwode_mian" size="100"></xd-font-icon>
             </view>

package/src/components/JfbBaseWallet/Attr.js

@@ -473,6 +473,12 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '',
+        ele: 'slot',
+        slot: 'is_reference',
+        groupKey:'advanced',
+      },
     ].filter(i => i)
   },
   advanced: [],