jufubao-base 1.0.61-beta1003 → 1.0.61-beta1005

package/package.json

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

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -262,9 +262,9 @@ export default {
             );
           }
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.map(item=>{
+            res.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
-              return item
+              return res.business_codes.includes(item.business_code)
             })
           }
           this.info = res;

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -132,7 +132,7 @@
             class="card-list"
             :key="item.card_number"
             @click="toDetail(item)"
-            v-if="setCardItemShow(item)"
+            v-if="setCardItemShow(item,index)"
             :style="{
               background: item['theme']['color'],
               backgroundSize: '100%',
@@ -209,13 +209,12 @@
             </view>
           </view>
           <view
-            class="card-content-empty"
+            class="card-content-empty card-list"
             v-else
             :style="{
               height: item.height + 'px',
-              backgroundImage: 'url('+ (item.entries.length > 1 ? cardItemBg2: cardItemBg1) +')'
             }"
-          ></view>
+          ><image :src="item.entries.length > 1 ? cardItemBg2: cardItemBg1"></image></view>
         </view>
         <view v-else-if="cardList === null && cardList.length === 0">
           <view class="jfb-base-card-entry__body-empty">
@@ -1056,5 +1055,10 @@ export default {
   background-size: 100%;
   background-repeat: no-repeat;
   background-position: top center;
+
+  & > image {
+    width: 100%;
+    height: 100%;
+  }
 }
 </style>

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -289,9 +289,9 @@ export default {
               }
             });
             if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.map(item=>{
+              res.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
-              return item
+              return res.business_codes.includes(item.business_code)
             })
           }
 
@@ -326,9 +326,9 @@ export default {
             }
           });
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.map(item=>{
+            res.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
-              return item
+              return res.business_codes.includes(item.business_code)
             })
           }
           this.headerBg = this.getCardThemes(res.card_type_name);

package/src/mixins/cardListMixins.js

@@ -8,7 +8,7 @@ export default {
 
       //卡券列表
       cardOrgList:[], //原始数据
-      cardList:null, //计算后的卡列表
+      cardList:[], //计算后的卡列表
       cardPageNum: 0, //当前页面
       cardPageLen: 10, //每页获取数据调试
       cardComputedList:[], //当前获取的数据列表
@@ -19,27 +19,44 @@ export default {
 
       //转换按钮
       hasChangeStatus: false,//是否有转换按钮
+
+      cardItemBg1: '//img.jufubao.cn/component/card/card_item_02.png',
+      cardItemBg2: '//img.jufubao.cn/component/card/card_item_01.png'
     }
   },
   computed:{
     ...mapState(['srollPreview'])
   },
   watch:{
-    srollPreview(value){
-      console.log(value)
-    }
+    // srollPreview(value){
+    //   console.log(value)
+    // }
   },
   created(){
 
+  },
+
+  mounted(){
+
+
   },
   methods:{
-    setCardItemShow({height , top}){
-      let fiexd = 100;
+    setCardItemShow({height , top},index){
+
+      //预览模式只获取10条
+      if(this.$configProject.isPreview) {
+        console.log(this.cardPageLen, index, this.cardPageLen > index)
+        return this.cardPageLen > index;
+      }
+
+      //打包模式
+      let fiexd = 50;
       let boxTop = top + height + fiexd;
       let boxBottom = top - (fiexd);
       let {pageWindowPrevStart, pageWindowPrevEnd} = this.srollPreview;
       return boxTop > pageWindowPrevStart && boxBottom < pageWindowPrevEnd;
     },
+
     getBoxTop(){
       return new Promise((resolve, reject)=>{
         const query = uni.createSelectorQuery().in(this);
@@ -51,7 +68,8 @@ export default {
       })
 
     },
-    async handleCardComputed(){
+
+    async handleCardComputed(paddingBottom){
       this.$xdShowLoading({});
       if(this.contentStatus === false)  await this.getBoxTop();
       this.$nextTick(()=>{
@@ -61,18 +79,23 @@ 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
           });
+
+
           this.cardList = this.cardList.concat(arr);
+
+
+
           this.$xdHideLoading();
         }).exec();
       })
     },
 
-    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";
@@ -83,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(){
@@ -111,7 +134,7 @@ export default {
 
     clearDefault(){
       this.cardOrgList = [];
-      this.cardList = null;
+      this.cardList = [];
       this.cardPageNum = 0;
       this.cardComputedList = [];
       this.cardLoading = false;