jufubao-base 1.0.61-beta1011 → 1.0.61-beta1013

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -531,7 +531,7 @@ export default {
         .catch(() => this.$xdHideLoading());
     },
 
-    onShow(options) {
+    onJfbShow(options) {
       this.onJfbLoad(options);
     },
 

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -66,7 +66,7 @@
        >
       进入业务板块
       </view>
-      <view style="display:flex;align-content:center;justify-content:center">
+      <view style="display:flex;align-content:center;justify-content:flex-start">
         <view class="jfb-base-card-detail-entry__body-business-content">
         <view
         class="jfb-base-card-detail-entry__body-business-content-item"

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -21,62 +21,64 @@
           v-if="cardList && cardList.length > 0"
           class="jfb-base-card-entry__body-card"
         >
-          <view
-            v-for="(item,index) in cardList"
-            class="card-list"
-            :data-card="item.card_number"
-            :data-index="index"
-            :data-top="item.top"
-            :key="item.card_number"
-            v-if="setCardItemShow(item,index)"
-            :style="{
-              background: item['theme']['color'],
-              backgroundSize: '100%'
-            }"
-          >
-            <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
-              <view class="card-list__title">
-                <view>{{item['card_type_name']}}</view>
-              </view>
-              <div class="card-list__content">
-                <view>
-                  <text>券号：</text>
-                  <text>{{item.card_number}}</text>
+          <template v-for="(item,index) in cardList">
+            <view
+              class="card-list"
+              :data-card="item.card_number"
+              :data-index="index"
+              :data-top="item.top"
+              :key="item.card_number"
+              v-if="setCardItemShow(item,index)"
+              :style="{
+                background: item['theme']['color'],
+                backgroundSize: '100%'
+              }"
+            >
+              <view class="card-list-warp" :style="{backgroundImage: 'url('+ item['theme']['image'] +')'}">
+                <view class="card-list__title">
+                  <view>{{item['card_type_name']}}</view>
                 </view>
-              </div>
-              <view class="card-list__date">
-                <text>有效期：</text>
-                <text>--</text>
-              </view>
-              <view class="card-list__yue">
-                <text>余额：</text>
-                <text>--</text>
-              </view>
-              <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2 ">
-                <view>
-                  <text>购买其他物品可抵：</text>
+                <div class="card-list__content">
+                  <view>
+                    <text>券号：</text>
+                    <text>{{item.card_number}}</text>
+                  </view>
+                </div>
+                <view class="card-list__date">
+                  <text>有效期：</text>
                   <text>--</text>
                 </view>
-              </view>
-              <template>
-                <view class="card-list__entry" v-if="item.entries.length > 0">
-                  <view
-                    @click.stop="handleUnBindCard(item)"
-                    :style="{color: item['theme']['color']}"
-                  >解绑</view>
+                <view class="card-list__yue">
+                  <text>余额：</text>
+                  <text>--</text>
+                </view>
+                <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2 ">
+                  <view>
+                    <text>购买其他物品可抵：</text>
+                    <text>--</text>
+                  </view>
                 </view>
-                <view class="card-list__nodata" v-else>暂无支持服务列表</view>
-              </template>
+                <template>
+                  <view class="card-list__entry" v-if="item.entries.length > 0">
+                    <view
+                      @click.stop="handleUnBindCard(item)"
+                      :style="{color: item['theme']['color']}"
+                    >解绑</view>
+                  </view>
+                  <view class="card-list__nodata" v-else>暂无支持服务列表</view>
+                </template>
+              </view>
             </view>
-          </view>
-          <view
-            class="card-content-empty card-list"
-            v-else
-            :style="{
+            <view
+              class="card-content-empty card-list"
+              v-else
+              :data-card="item.card_number"
+              :style="{
               height: item.height + 'px',
               backgroundImage: 'url('+  cardItem +')'
             }"
-          ></view>
+            ></view>
+          </template>
         </view>
         <view v-if="cardList !== null && cardList.length === 0">
           <view class="jfb-base-card-disabled-entry__body-empty">
@@ -295,6 +297,7 @@ export default {
     onJfbBack(options) {
       console.log("event.onJfbBack", options);
     },
+
   },
 };
 </script>

package/src/components/JfbBaseCardDisabledEntry/cardListMixins.js

@@ -1,5 +1,5 @@
 'use strict';
-import {mapState} from "vuex";
+import {mapState,mapMutations} from "vuex";
 
 export default {
   data() {
@@ -28,7 +28,15 @@ export default {
     ...mapState(['srollPreview'])
   },
 
+  created() {
+    this.setSrollPreview({
+      pageWindowPrevStart: 0,
+      pageWindowPrevEnd: uni.getSystemInfoSync().safeArea.height,
+    });
+  },
+
   methods:{
+    ...mapMutations(['setSrollPreview']),
     setCardItemShow({height , top},index){
       //预览模式只获取10条
       if(this.$configProject.isPreview) {
@@ -86,7 +94,10 @@ export default {
         return item
       });
       this.cardOrgList = this.$xdUniHelper.cloneDeep(validCardList);
-      this.cardComputedList = this.cardOrgList.slice(this.cardPageNum,this.cardPageLen);
+      this.cardComputedList = this.cardOrgList.slice(
+        this.cardPageNum*this.cardPageLen,
+        this.cardPageNum*this.cardPageLen + this.cardPageLen
+      );
       this.handleCardComputed(paddingBottom).then().catch();
     },
 
@@ -95,7 +106,6 @@ export default {
       this.cardLoading = true;
       this.$xdShowLoading({});
       this.cardPageNum++;
-      console.log('onJfbReachBottom',this.cardPageNum)
       this.$nextTick(()=>{
         setTimeout(()=>{
           this.cardLoading = false;
@@ -112,6 +122,14 @@ export default {
       })
 
     },
+
+    onJfbScroll({e}){
+      this.setSrollPreview({
+        pageWindowPrevStart: e.scrollTop,
+        pageWindowPrevEnd:e.scrollTop + uni.getSystemInfoSync().safeArea.height
+      })
+    },
+
   }
 }
 

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -663,7 +663,7 @@ export default {
       })
         .then((res) => {
           this.showDisabled = res.is_show_invalid_card_entrance;
-          res.list.map((item) => {
+          res.list = res.list.map((item) => {
             return {
               ...item,
               card_point: this.$xdUniHelper.divisionFloatNumber(
@@ -683,15 +683,12 @@ export default {
           this.hasChangeStatus = this.getCardGroupItem(this.ajaxCardList.list.filter((item) => {
             return item["is_exchange"] === "Y";
           }), res['site_entry_settings']).length > 0;
+
           this.$xdHideLoading();
         })
         .catch(() => this.$xdHideLoading());
     },
 
-    onShow(options) {
-      this.onJfbLoad(options);
-    },
-
     onJfbUpdate(data) {
       this.getContent();
     },

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -93,7 +93,7 @@
             style="
               display: flex;
               align-content: center;
-              justify-content: center;
+              justify-content: flex-start;
             "
           >
             <view class="jfb-base-card-info-entry__body-business-content">
@@ -289,7 +289,7 @@ export default {
               }
             });
             if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-              res.site_entry_settings = res.site_entry_settings.filter(item=>{
+              temp.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
               return res.business_codes.includes(item.business_code)
             })
@@ -326,7 +326,7 @@ export default {
             }
           });
           if(res && res.site_entry_settings && res.site_entry_settings.length>0) {
-            res.site_entry_settings = res.site_entry_settings.filter(item=>{
+            temp.site_entry_settings = res.site_entry_settings.filter(item=>{
               item['image_url'] = getServiceUrl(item['image_url'])
               return res.business_codes.includes(item.business_code)
             })

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -85,12 +85,12 @@
         let { inCallback } = options;
         if (inCallback) inCallback = Base64.decode(inCallback);
         this.inCallback = inCallback || this.settings.index;
-        
+
         let params = {is_all: 'Y'};
         if (options['jfb_business_code']) {
           params['card_business_code'] = options['jfb_business_code'];
         }
-        
+
         jfbRootExec("getListCardBind", {
           vm: this,
           data: params,
@@ -179,26 +179,9 @@
           );
         }
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
+
       onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
+        this.onJfbLoad(options);
       },
     }
   }