jufubao-base 1.0.140-beta3 → 1.0.140-beta5

package/package.json

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

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -156,7 +156,7 @@
                     <view>{{ item.card_type_name }}</view>
                   </view>
                   <view>
-                    <view>{{ item.card_number }}</view>
+                    <view>{{ item.card_number }}{{showIndex?(':' + index):''}}</view>
                     <view>有效期至：{{ item.end_time }}</view>
                   </view>
                 </view>
@@ -307,6 +307,7 @@ export default {
       disableList: [], //不可用卡列表
       inCallback: null, //内部跳转地址
       loadingCardList: true,
+      showIndex: false,
 
       //页面跳转地址
       login_name:'',//登录文案
@@ -526,6 +527,7 @@ export default {
 
     onJfbLoad(options) {
       this.options = options;
+      if(options['x-test'] === 'jfb-console') this.showIndex = true;
       let { inCallback } = options;
       if(!inCallback) this.$storage.remove("inCallback"); //作为入口
       else {
@@ -577,12 +579,15 @@ export default {
             item['index'] = index;
             return item
           });
+          console.warn(`cardList:${this.cardList.length}`)
           this.disableList = res.list.filter((item) => {
             return item["is_valid"] === "N";
           });
+          console.warn(`disableList:${this.disableList.length}`)
           this.changeList = this.cardList.filter((item) => {
             return item["is_exchange"] === "Y";
           })
+          console.warn(`changeList:${this.changeList.length}`)
           this.showList = this.getPageCardContent(this.cardList);
           if(this.hasContent) this.offsetIndex++;
           this.$xdHideLoading();
@@ -598,7 +603,11 @@ export default {
     onJfbShow(options) {
       this.offsetIndex = 0;
       this.hasContent = true;
-      this.tabIndex = 0;
+      this.tabIndex = 1;
+      this.disableList = [];
+      this.changeList=[];
+      this.showList = [];
+      debugger
       this.onJfbLoad(options);
     },
 

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -216,7 +216,7 @@ export default {
           //设置列表
           this.ajaxCardList =  res;
           this.handleCardInit(this.ajaxCardList);
-
+          this.cardPageNum = 1;
           this.$xdHideLoading();
         })
         .catch(() => this.$xdHideLoading());

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -150,6 +150,7 @@
             </view>
           </view>
         </view>
+
         <template v-else>
           <view
             v-if="tabIndex === 2 || tabIndex === 1 && (cardList && cardList.length > 0)"
@@ -175,7 +176,7 @@
                 <view class="card-list__content">
                   <view>
                     <text>券号：</text>
-                    <text>{{item.card_number}}</text>
+                    <text>{{item.card_number}}{{showIndex?(':' + index):''}}</text>
                   </view>
                   <view @click.stop="toDetail(item)" v-if="isShowCode === 'Y'">
                     <view>
@@ -285,6 +286,7 @@
           ></xd-font-icon>
         </view>
       </view>
+
       <view class="computed-height" >
         <view
           v-for="(item,index) in cardComputedList"
@@ -416,6 +418,7 @@ export default {
     },
     tabIndex(){
       this.clearDefault();
+      this.cardPageNum = 0;
       this.onJfbLoad(this.options);
     }
   },
@@ -450,6 +453,7 @@ export default {
       //cardLayout: "1",  //票券布局
       showDisabled: 'Y',
       showCardList: false,
+      showIndex:false,
 
       //活动
       dialogEvent: false,
@@ -660,6 +664,7 @@ export default {
     },
 
     onJfbLoad(options) {
+      if(options['x-test'] === 'jfb-console') this.showIndex = true;
       this.options = options;
       let { inCallback } = options;
       if(!inCallback) this.$storage.remove("inCallback"); //作为入口
@@ -712,9 +717,8 @@ export default {
           this.hasChangeStatus = this.getCardGroupItem(this.ajaxCardList.list.filter((item) => {
             return item["is_exchange"] === "Y";
           }), res['site_entry_settings']).length > 0;
-
-
           this.handleCardInit(this.ajaxCardList, this.tabIndex === 1);
+          this.cardPageNum = 1;
           this.$xdHideLoading();
         })
         .catch(() => this.$xdHideLoading());