jufubao-base 1.0.56-beta2006 → 1.0.56-beta2008

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -94,9 +94,9 @@
       </view>
       <view style="display:flex;align-content:center;justify-content:center">
         <view class="jfb-base-card-detail-entry__body-business-content">
-        <view 
+        <view
         class="jfb-base-card-detail-entry__body-business-content-item"
-        v-for="(item,index) in info.site_entry_settings" 
+        v-for="(item,index) in info.site_entry_settings"
         :key="index">
           <view><image :src="item.image_url"></image></view>
           <view>{{item.entry_name}}</view>
@@ -107,25 +107,25 @@
     <view :style="{height: '100rpx'}"></view>
         <!-- 靠底支付 -->
         <view class="fixe_bottom" :style="prod_bottom">
-          <!-- <xd-button 
-          radius="8rpx" 
-          size="small" 
+          <!-- <xd-button
+          radius="8rpx"
+          size="small"
           type="primary">
           消费记录
         </xd-button> -->
-          <xd-button 
+          <xd-button
           v-if="info.is_exchange==='Y'"
-          @click="handleToShift" 
-          radius="8rpx" 
-          size="small" 
+          @click="handleToShift"
+          radius="8rpx"
+          size="small"
           type="primary">
           券转换
         </xd-button>
-          <xd-button 
+          <xd-button
           v-if="isShowUnbind"
-          @click="handleUnBindCard" 
-          radius="8rpx" 
-          size="small" 
+          @click="handleUnBindCard"
+          radius="8rpx"
+          size="small"
           type="primary">
           解除绑定
         </xd-button>
@@ -525,7 +525,7 @@ export default {
       left: 50%;
       transform: translate(-50rpx, -50rpx);
     }
-    margin: unit(26, rpx);
+    padding: unit(26, rpx);
     &-header {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);
@@ -692,7 +692,7 @@ export default {
         
         &:last-child {
           margin-right: 0;
-        } 
+        }
       }
     }
     }

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -15,7 +15,7 @@
       >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-info-entry__body">
+    <view class="jfb-base-card-info-entry__body" :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}">
       <view v-if="!qrcode && showForm">
         <view>
           <view class="jfb-base-card-info-entry__body-form">
@@ -400,6 +400,7 @@ export default {
 .jfb-base-card-info-entry {
   &__body {
     color: #333;
+    padding: unit(26, rpx);
     &-form {
       display: flex;
       align-items: center;
@@ -443,7 +444,6 @@ export default {
       left: 50%;
       transform: translate(-50rpx, -50rpx);
     }
-    margin: unit(26, rpx);
     &-header {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -13,7 +13,10 @@
       <view class="jfb-base-card-merge-entry__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-merge-entry__body">
+    <view
+      class="jfb-base-card-merge-entry__body"
+      :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}"
+    >
       <view class="merge">
         <view class="merge-item" :style="{background: themeOutStyle['color']}">
           <view class="merge-item-box" :style="{backgroundImage: 'url(//img.jufubao.cn/component/card/mergbg.jpg)'}">
@@ -74,24 +77,24 @@
           </view>
         </view>
       </view>
-    </view>
-    <view class="xd-notice" :style="{ color: warningColor }" v-if="content">
-      <xd-content-xss v-html="content"></xd-content-xss>
-    </view>
-    <view
-      v-if="isPreview && statusContent === true && content === '' "
-      class="xd-notice"
-      :style="{ color: dangerColor,fontSize: 24 + 'rpx' }"
-    >温馨提示未配置数据，因此改模块在正式环境将不显示</view>
-    <view class="bottom_btn-mask"></view>
-    <view class="bottom_btn" :style="prod_bottom">
-      <xd-button
-        :key="disabledKey"
-        :disabled="disabled"
-        @click="handleToSubmit"
-        width="90%"
-        :type="disabled ?'info': 'primary'"
-      >合并</xd-button>
+      <view class="xd-notice" :style="{ color: warningColor }" v-if="content">
+        <xd-content-xss v-html="content"></xd-content-xss>
+      </view>
+      <view
+        v-if="isPreview && statusContent === true && content === '' "
+        class="xd-notice"
+        :style="{ color: dangerColor,fontSize: 24 + 'rpx' }"
+      >温馨提示未配置数据，因此改模块在正式环境将不显示</view>
+      <view class="bottom_btn-mask"></view>
+      <view class="bottom_btn" :style="prod_bottom">
+        <xd-button
+          :key="disabledKey"
+          :disabled="disabled"
+          @click="handleToSubmit"
+          width="90%"
+          :type="disabled ?'info': 'primary'"
+        >合并</xd-button>
+      </view>
     </view>
   </view>
 </template>
@@ -141,8 +144,6 @@ export default {
   
       content: "",
       contentBackgroundColor: '',
-      
-      selfMask: true,
       cardPath: '', //卡券主页
       
       //提示文案

package/src/components/JfbBaseCardMergeEntry/Mock.js

@@ -1,5 +1,32 @@
 'use strict';
 
 module.exports = {
-
+  fromCardListEntry : {
+      "list": [{
+        "card_number": "101001000008422",
+        "card_point": 100000,
+        "card_type_name": "聚福宝福"
+      }, {
+        "card_number": "121000100000028",
+        "card_point": 10000,
+        "card_type_name": "抵扣券测试"
+      }, {
+        "card_number": "101001000005192",
+        "card_point": 99995900,
+        "card_type_name": "聚福宝福"
+      }, {
+        "card_number": "101001000008421",
+        "card_point": 100000,
+        "card_type_name": "聚福宝福"
+      }, {
+        "card_number": "261001000002518",
+        "card_point": 100000,
+        "card_type_name": "加盟商福卡"
+      }, {
+        "card_number": "101001000007175",
+        "card_point": 9899544,
+        "card_type_name": "聚福宝福"
+      }, {"card_number": "261001000000344", "card_point": 100, "card_type_name": "大礼包测试"}],
+      "request_id": "4c836d402cbcbe80"
+    }
 }

package/src/components/JfbBaseCardShiftEntry/JfbBaseCardShiftEntry.vue

@@ -18,8 +18,8 @@
     <!-- #endif -->
     <view
       class="jfb-base-card-shift-entry__body"
-      style="position: relative"
       v-if="info !== null"
+      :style="{minHeight: layoutInfo.bodyMinHeightRpx + 'rpx'}"
     >
     <view
         class="jfb-base-card-shift-entry__body-header"
@@ -127,11 +127,11 @@
       <view :style="{height: '100rpx'}"></view>
         <!-- 靠底支付 -->
         <view class="fixe_bottom" :style="prod_bottom">
-          <xd-button 
+          <xd-button
           @click="handleChange"
           width="500rpx"
-          radius="8rpx" 
-          size="small" 
+          radius="8rpx"
+          size="small"
           type="primary">
           转换
         </xd-button>
@@ -155,7 +155,7 @@
           <text :style="{color:mainColor,marginLeft:'20rpx'}">转换成功</text>
           </view>
           <view class="jfb-base-card-shift-entry__body-success-content">
-            已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为 
+            已成功将  <text style="color:#333;padding: 0 16rpx">{{ card_number }}</text>  转换成为
             <text style="color:#333;padding: 0 16rpx">{{ changeNumber }}</text>可在券包中查看
           </view>
           <xd-button type="primarys" width="360rpx" @click="handleToLink"
@@ -322,8 +322,9 @@ export default {
   box-sizing: border-box;
 
   &__body {
+    position: relative;
     color: #333;
-    margin: unit(26, rpx);
+    padding: unit(26, rpx);
     &-header {
       border-radius: unit(16, rpx);
       font-size: unit(40, rpx);