jufubao-base 1.0.145 → 1.0.146-beta32

package/package.json

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

package/src/components/JfbBaseAddress/XdAddress.vue

@@ -391,6 +391,10 @@ export default {
     },
 
     setReceiptRegionName() {
+      console.log(this.level,'apapappap');
+      this.city_name = this.city_name.splice(0, this.level+1);
+      this.city_code = this.city_code.splice(0, this.level+1);
+      // this.city_selected_data = this.city_selected_data.splice(0, this.level+1);
       this.receipt_region_name = this.city_name.join(this.citySeparator);
     },
 
@@ -423,10 +427,10 @@ export default {
     },
 
     selectCity(item) {
+      console.log(this.maxLevel,'this.maxLevel');
       if (this.level < this.maxLevel - 1) {
         this.level++;
       }
-
       //保存信息
       this.$set(this.city_name, this.level, item.label);
       this.$set(this.city_code, this.level, item.value);

package/src/components/JfbBaseCardDisabled/JfbBaseCardDisabled.vue

@@ -121,7 +121,7 @@ export default {
   },
   created() {
     this.init(this.container);
-    
+
   },
   methods: {
     onJfbLoad(options) {
@@ -195,9 +195,9 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {},
-    
+
     onJfbBack(options) {
-      console.log("event.onJfbBack", options);
+      this.$xdUniHelper.navigateBack();
     },
   },
 };

package/src/components/JfbBaseCardDisabledEntry/JfbBaseCardDisabledEntry.vue

@@ -41,7 +41,7 @@
                 <div class="card-list__content">
                   <view>
                     <text>券号：</text>
-                    <text>{{item.card_number}}</text>
+                    <text>{{item.card_number}}{{isShowIndex?`--${item.index}`:''}}</text>
                   </view>
                 </div>
                 <view class="card-list__date">
@@ -169,8 +169,8 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseCardDisabledEntryMixin, colorCardMixins, cardListMixins],
   data() {
     return {
-      disableList: [],
-      isShowUnbind: false
+      isShowUnbind: false,
+      isShowIndex:false,
     };
   },
   computed:{
@@ -191,9 +191,11 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.isShowIndex = options['show_index'] === '1';
       this.getCardList();
     },
 
+
     getCardList() {
       this.$xdShowLoading({});
       jfbRootExec("getDisableCardListEntry", {vm: this, data: {is_all: "Y", is_show_entry_settings: 'Y'},})
@@ -233,7 +235,7 @@ export default {
         vm: this,
         success: (res) => {
           if (res.confirm) {
-            let cardIds = this.disableList.map(item=>{
+            let cardIds = this.cardOrgList.map(item=>{
               return item.card_number + ''
             });
             jfbRootExec("batchDisabledCardUnbindEntry", {vm: this, data: {card_numbers: cardIds.join(','),},})
@@ -241,6 +243,7 @@ export default {
                 this.$xdAlert({
                   content: "全部失效票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });
@@ -275,6 +278,7 @@ export default {
                 this.$xdAlert({
                   content: "票券已解绑",
                   close: () => {
+                    this.clearData();
                     this.getCardList();
                   },
                 });
@@ -295,7 +299,7 @@ export default {
     init(container) {},
 
     onJfbBack(options) {
-      console.log("event.onJfbBack", options);
+      this.$xdUniHelper.navigateBack();
     },
 
   },

package/src/components/JfbBaseCardDisabledEntry/cardListMixins.js

@@ -65,6 +65,19 @@ export default {
 
     },
 
+    clearData(){
+      this.ajaxCardList = null;
+      this.cardOrgList = []
+      this.cardList = null;
+      this.cardPageNum = 0;
+      this.cardComputedList = [];
+      this.cardLoading = false;
+      this.cardNextTop = 0;
+      this.cardIndex = 0;
+      this.contentStatus = false;
+      this.hasContent = true;
+    },
+
     async handleCardComputed(paddingBottom=30){
       this.$xdShowLoading({});
       if(this.contentStatus === false)  await this.getBoxTop();
@@ -83,7 +96,6 @@ export default {
             return card
           });
           this.cardList = (this.cardList||[]).concat(arr);
-          this.cardPageNum++;
           this.$xdHideLoading();
         }).exec();
       })
@@ -102,6 +114,7 @@ export default {
         this.cardPageNum*this.cardPageLen,
         this.cardPageNum*this.cardPageLen + this.cardPageLen
       );
+      console.warn(`无效卡张数:${validCardList.length} 张，页码：第 ${this.cardPageNum} 页`);
       if(this.cardComputedList.length < this.cardPageLen) {
         this.hasContent = false;
       }
@@ -120,6 +133,7 @@ export default {
             this.cardPageNum*this.cardPageLen,
             this.cardPageNum*this.cardPageLen + this.cardPageLen
           );
+          console.warn(`无效卡张数:${this.cardOrgList.length} 张，页码：第 ${this.cardPageNum} 页`);
           this.handleCardComputed().then().catch();
           if(this.cardComputedList.length < this.cardPageLen) {
             this.hasContent = false;