jufubao-base 1.0.61-beta1004 → 1.0.61-beta1006

package/package.json

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

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -89,15 +89,20 @@
         </xd-notice-bar>
       </view>
       <view
-        v-if="noticeStatus && isPreview && notice === ''"
         class="jfb-base-card-entry__body-notice"
-        :style="{
+        v-if="noticeStatus && isPreview && notice === ''"
+      >
+        <view
+          class="jfb-base-card-entry__body-notice-in"
+          :style="{
           background: noticeBackgroundColor,
           textAlign: 'center',
           color: dangerColor,
           fontSize: 26 + 'rpx',
         }"
-      >该组件未配置数据，因此改模块在正式环境将不显示</view>
+        >该组件未配置数据，因此改模块在正式环境将不显示</view>
+      </view>
+
       <view class="jfb-base-card-entry__body-tab">
         <view
           @click="tabIndex = 1"
@@ -794,10 +799,14 @@ export default {
     }
 
     &-notice {
-      margin: unit(30, rpx) unit(-35, rpx) 0 unit(-35, rpx);
+      overflow: hidden;
+      width: 100%;
+      &-in {
+        margin: unit(30, rpx) unit(-35, rpx) 0 unit(-35, rpx);
+        padding: unit(22, rpx) unit(35, rpx);
+        line-height: unit(70, rpx);
+      }
 
-      padding: unit(22, rpx) unit(35, rpx);
-      line-height: unit(70, rpx);
     }
 
     &-tab {

package/src/mixins/cardListMixins.js

@@ -69,7 +69,7 @@ export default {
 
     },
 
-    async handleCardComputed(){
+    async handleCardComputed(paddingBottom){
       this.$xdShowLoading({});
       if(this.contentStatus === false)  await this.getBoxTop();
       this.$nextTick(()=>{
@@ -79,7 +79,7 @@ export default {
             let card =  this.cardComputedList.filter(it=>{
               return item.dataset.card === it.card_number;
             })[0];
-            card['height'] = item.height + 15;
+            card['height'] = item.height + (paddingBottom * this.$rpxNum);
             card['top'] =  this.cardNextTop;
             this.cardNextTop =  this.cardNextTop + card['height']
             return card
@@ -95,7 +95,7 @@ export default {
       })
     },
 
-    handleCardInit(cardList,isChange = false){
+    handleCardInit(cardList,isChange = false, paddingBottom = 30){
       let newCardList = this.$xdUniHelper.cloneDeep(cardList);
       let validCardList = this.getCardGroupItem(newCardList.list.filter((item) => {
         if(isChange === true)  return item["is_valid"] === "Y";
@@ -106,7 +106,7 @@ export default {
       });
       this.cardOrgList = this.$xdUniHelper.cloneDeep(validCardList);
       this.cardComputedList = this.cardOrgList.slice(this.cardPageNum,this.cardPageLen);
-      this.handleCardComputed().then().catch();
+      this.handleCardComputed(paddingBottom).then().catch();
     },
 
     onJfbReachBottom(){