jufubao-base 1.0.228 → 1.0.230

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -23,34 +23,49 @@
           </view>
           <view class="qrcode_wrap" style="position: relative">
             <image
-              :style="{width: '300rpx', height: '300rpx'}"
+              :style="{width: '280rpx', height: '280rpx'}"
               :src="info.card_qrcode"
             ></image>
             <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
           </view>
-          <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
-          <view class="refresh_wrap" @click="handleRefresh">
+          <view style="display:flex;align-items: center;justify-content: center;z-index: 111;position: relative;">
+            <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
+            <view @click="handleRefresh" style="margin-left: 12rpx;">
+              <xd-font-icon
+                icon="iconmian-loading"
+                :size="32"
+                color="#666666"
+              ></xd-font-icon>
+            </view>
+          </view>
+          <view class="card_bottom"></view>
+          <!-- <view class="refresh_wrap" @click="handleRefresh">
             <xd-font-icon
               icon="iconshuaxin"
               style="margin-right: 24rpx;"
               size="28"
-            ></xd-font-icon> 刷新二维码</view>
+            ></xd-font-icon> 刷新二维码</view> -->
         </view>
         <view class="card_info">
           <view class="card_type">{{ info['card_type_name'] }}</view>
           <view class="card_sec">券号：{{ info.card_number }}</view>
           <view class="card_sec">有效期：{{ info.end_time }}</view>
-          <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
-          <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
-            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
+          <view class="card_sec">
+            余额：{{ info.card_point }}{{ info.unit }}
+            <text v-if="info.other_card_point && info.card_point_type === 2"
+              style="font-size: 24rpx;margin-left: 20rpx;"
+            >(购买其他物品可抵：{{info.other_card_point}} {{ info.unit }})</text>
           </view>
+          <!-- <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
+            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
+          </view> -->
         </view>
       </view>
       <view
         v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
         class="jfb-base-card-detail-entry__body-business"
       >
-        <view class="jfb-base-card-detail-entry__body-business-title">进入业务板块</view>
+        <!-- <view class="jfb-base-card-detail-entry__body-business-title">进入业务板块</view> -->
         <view style="display:flex;align-content:center;justify-content:flex-start">
           <view class="jfb-base-card-detail-entry__body-business-content">
             <view
@@ -558,6 +573,8 @@ export default {
       background-color: #FF2121;
       border-radius: 24rpx;
       padding: 24rpx;
+
+      
       &-title{
         display: flex;
         font-size: 32rpx;
@@ -569,10 +586,13 @@ export default {
         .card_type{
           font-size: 40rpx;
           font-weight: 600;
-          margin-top: 70rpx;
+          margin-top: 60rpx;
         }
         .card_sec{
-          margin: 12rpx 0;
+          margin: 10rpx 0;
+          &:last-child{
+            margin-bottom: 0rpx;
+          }
         }
         .card_other{
           background-color: rgba(255,255,255, 0.2);
@@ -813,7 +833,8 @@ export default {
       padding: unit(20,rpx) unit(70,rpx) 0 unit(70,rpx);
       color: #000;
       position: relative;
-      &::after{
+
+      .card_bottom{
         content: " ";
         position: absolute;
         left: 0;
@@ -824,6 +845,17 @@ export default {
         border-radius: 100%;
         z-index: 1;
       }
+      // &::after{
+      //   content: " ";
+      //   position: absolute;
+      //   left: 0;
+      //   bottom: -40rpx;
+      //   width: 100%;
+      //   height: 100rpx;
+      //   background: #FFFFFF;
+      //   border-radius: 100%;
+      //   z-index: 1;
+      // }
 
       & > view {
         // margin-bottom: unit(20, rpx);
@@ -851,7 +883,7 @@ export default {
         justify-content: center;
         align-items: center;
         box-sizing: border-box;
-        height: unit(200, rpx);
+        height: unit(140, rpx);
         width: 100%;
 
         & > view {
@@ -892,6 +924,7 @@ export default {
       background: #fff;
       border-radius: unit(16,rpx);
       margin-top: unit(24,rpx);
+      padding-top: unit(28,rpx);
 
       &-title {
         font-size: unit(28,rpx);

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/JfbBaseOrderDetail/Attr.js

@@ -384,6 +384,27 @@ export default {
             });
         },
       },
+      {
+        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: "title",

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -339,6 +339,7 @@
                 </view>
                 <view
                   class="jfb-base-order-detail__body-num-info-copy"
+                  :style="{fontSize: btnTextSize+'rpx'}"
                   @click="copy(item.code)"
                 >复制</view>
                 <view
@@ -368,6 +369,7 @@
                   </view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
+                    :style="{fontSize: btnTextSize+'rpx'}"
                     @click="copy(item.code)"
                   >复制</view>
                 </view>
@@ -380,6 +382,7 @@
                   </view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
+                    :style="{fontSize: btnTextSize+'rpx'}"
                     @click="copy(item.password)">复制</view>
                   <view
                     v-if="item.code_end_time"
@@ -403,6 +406,7 @@
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
                     style="margin-top: 0;"
+                    :style="{fontSize: btnTextSize+'rpx'}"
                     @click="handleShowCode(item)">查看二维码和{{ item.password_title }}</view>
                   <view
                     v-if="item.code_end_time"
@@ -426,6 +430,7 @@
                   </view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
+                    :style="{fontSize: btnTextSize+'rpx'}"
                     @click="handleShowCode(item)"
                     >查看一维码</view>
                   <view
@@ -538,7 +543,7 @@
               <view v-html="item.value"></view>
             </view>
             <view
-              :style="{ marginLeft: '30rpx' }"
+              :style="{ marginLeft: '30rpx', fontSize: btnTextSize+'rpx' }"
               v-if="item.type === 'copy'"
               class="jfb-base-order-detail__body-order-copy"
               @click="copy(item.value)"
@@ -893,6 +898,7 @@ export default {
       is_show_all_detail: '',
       showPreviewCode: true,
       is_show_product: "",
+      btnTextSize: 20,
     };
   },
   watch: {
@@ -1213,6 +1219,7 @@ export default {
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
       this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
+      this.btnTextSize = getContainerPropsValue(container, "content.btnTextSize", 20);
       let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
       this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
         type: this.is_shadow,

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: [],