jufubao-base 1.0.158-beta6 → 1.0.158-beta8

package/package.json

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

package/src/components/JfbBaseConDialog/XdCouCardBind.vue

@@ -31,10 +31,9 @@
             ></xd-font-icon>
           </view>
         </view>
-        <view v-else>
+        <view style="text-align:center;padding-top:54rpx;padding-bottom:30rpx" v-else>
           <img
-            style="width: 100%"
-            mode="widthFix"
+            style="width:360rpx;height:340rpx"
             :src="bottomBackground"
             alt=""
           />
@@ -45,7 +44,9 @@
           :style="{
             backgroundImage: btnImage,
             backgroundSize: '100% 100%',
-            width: '80%'
+            height: '70rpx',
+            width: '450rpx',
+            marginTop: '26rpx'
           }"
           @click="getAllCoupont"
           >{{ isRandom ? "开心获取" : "一键领取" }}</xd-button

package/src/components/JfbBaseConList/Attr.js

@@ -56,6 +56,17 @@ export default {
         placeholder: '请选择按钮文字颜色',
         classNmae: 'input60',
       },
+      {
+        label: "按钮文字大小",
+        ele: "el-input",
+        type: "number",
+        valueKey: "btnTextSize",
+        groupKey: 'content',
+        value: data.btnTextSize || '',
+        placeholder: "请输入按钮文字大小",
+        className: "input80",
+        inline: false,
+      },
       {
         label: '按钮圆角设置:',
         ele: 'xd-site-select-list',

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -49,10 +49,9 @@
             <view v-if="isAll">
               <view v-if="isRandom">
                 <view class="jfb-base-con-list__body-content-list">
-                  <view>
+                  <view style="text-align:center;padding-top:140rpx;padding-bottom:54rpx">
                     <img
-                      style="width: 100%"
-                      mode="widthFix"
+                      style="width:360rpx;height:340rpx"
                       :src="app_coupon_bottom_url"
                       alt=""
                     />
@@ -68,7 +67,6 @@
               </view>
               <view v-else>
                 <view
-                  v-if="can_take === 'Y'"
                   class="jfb-base-con-list__body-content-list"
                 >
                   <view>
@@ -78,8 +76,7 @@
                         :class="'status_' + item.can_take_num"
                         :style="{
                           backgroundColor:
-                            item.can_take_num === 'Y' ||
-                            item.can_take_num === 'P'
+                            item.can_take_num === 'Y'
                               ? contentBackground
                               : '#F3F3F3',
                         }"
@@ -114,13 +111,6 @@
                     >{{ btn_txt }}</xd-button
                   >
                 </view>
-                <view
-                  v-else
-                  class="jfb-base-con-list__body-content-list"
-                  style="padding-bottom: 60rpx"
-                >
-                  <image mode="widthFix" :src="used_up_url"></image>
-                </view>
               </view>
             </view>
 
@@ -195,6 +185,7 @@
                 color: btnTextColor,
                 backgroundColor: btnBgColor,
                 boxShadow: shadow,
+                fontSize: btnTextSize+'rpx'
               }"
               >查看已领票券</view
             >
@@ -288,6 +279,7 @@ export default {
       isRandom: false,
       btn_txt: "",
       btn_style: {},
+      btnTextSize: ''
     };
   },
   computed: {
@@ -347,6 +339,11 @@ export default {
         "content.btnTextColor",
         "#666"
       );
+      this.btnTextSize = getContainerPropsValue(
+        value,
+        "content.btnTextSize",
+        "28"
+      );
       this.radius = getContainerPropsValue(value, "content.radius", "0");
 
       this.is_border = getContainerPropsValue(value, "content.is_border", "N");
@@ -418,14 +415,16 @@ export default {
                   backgroundRepeat: "no-repeat",
                   // 设置背景颜色
                   backgroundColor: "",
-                  // 设置外边距
-                  margin: "0",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
                 }
               : {
                   // 设置背景颜色
                   backgroundColor: "#FB5B3F",
-                  // 设置外边距
-                  margin: "0",
+                  height: '70rpx',
+                  width: '450rpx',
+                  marginTop: '26rpx'
                 };
             // 设置按钮文字
             btn_txt = res.can_take === "Y" ? "一键领取" : "去查看";