gxd-uni-library-editx 1.0.111 → 1.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gxd-uni-library-editx",
-  "version": "1.0.111",
+  "version": "1.0.112",
   "private": false,
   "description": "聚福宝基础插件专用库",
   "main": "index.js",

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -446,11 +446,25 @@ export default {
       // #endif
 
       //获取卡券列表
-      callThis.getSettleListCards((cardList) => {
+      callThis.getSettleListCards(async (cardList) => {
         this.$xdLog.setARMSInfo(this.filterMGinfo(cardList), 'init_binded_list');
         this.cardList = cardList;
+
+        //如果有自动选中,则自动选中卡片，并且调用选卡接口，
+        let autoCardList = cardList.filter(item => item.is_auto_use === 'Y');
+        if(autoCardList.length > 0){
+          await this.autoUseCard(autoCardList, 0);
+        }
       })
     },
+    async autoUseCard(tickets, i){
+      let ticket = tickets[i];
+      if(!ticket) return Promise.resolve();
+      await this.handlerTicketSelect(true, ticket, {});
+      this.doTicketPay();
+      if(this.needPayPrice <= 0) return Promise.resolve();;
+      return this.autoUseCard(tickets, i + 1);
+    },
     //选卡弹出项
     useCardPop(data){
       return new Promise((resolve, reject) => {
@@ -480,85 +494,89 @@ export default {
 
     //选择卡券
     handlerTicketSelect(flat, ticket, options){
-      if(this.cardIsDisabled(ticket)) return;
+      if(this.cardIsDisabled(ticket)) return Promise.reject('卡片禁用');
 
-      if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
-        const {submitCardList, total_price} = this;
-        let callThis = this;
-        // #ifdef MP
-        callThis = this.$parent;
-        // #endif
-        this.$xdShowLoading({})
-        callThis.setSettleSelectCard({
-          total_price,
-          card_number: ticket.card_number,
-          selected_card_list_json: JSON.stringify(submitCardList),
-          selected_wallet_list_json: JSON.stringify(this.selected_wallet_list),
-          ...options
-        }, (res) => {
-          let resOptions = JSON.parse(JSON.stringify(res));
-          if(resOptions['selected_card_list1']) delete resOptions['selected_card_list1'];
-          if (resOptions['selected_card_list']){
-            resOptions['selected_card_list'] = this.filterMGinfo(resOptions['selected_card_list']);
-          }
-          this.$xdLog.setARMSInfo({
+      return new Promise((resolve, reject) => {
+        if(flat){ //选择卡券，重新调用接口获取 selectedCardList, neePayPrice
+          const {submitCardList, total_price} = this;
+          let callThis = this;
+          // #ifdef MP
+          callThis = this.$parent;
+          // #endif
+          this.$xdShowLoading({})
+          callThis.setSettleSelectCard({
+            total_price,
             card_number: ticket.card_number,
-            selected_card_list_json: this.filterMGinfo(submitCardList),
-            ...options,
-            res: resOptions
-          },'select_binded_card');
-          this.$xdHideLoading();
-          const {selected_card_list, need_pay_price, is_need_pop, card_total_use_price, card_total_use_point} = res;
-          if(is_need_pop){
-            this.useCardPop(res).then((select_content) => {
-              if(select_content){
-                this.handlerTicketSelect(true, ticket, {select_content})
-              }else{
-                this.handlerTicketSelect(false, ticket);
-              }
-            }).catch(() => {})
-          }else{
-            this.selectedCardList = selected_card_list;
-            this.needPayPrice = need_pay_price;
-            this.cardPayPrice = card_total_use_price;
-            this.cardPayPoint = card_total_use_point;
-            this.lastUseUnit = ticket.unit == '次' ? '次' : "";
+            selected_card_list_json: JSON.stringify(submitCardList),
+            selected_wallet_list_json: JSON.stringify(this.selected_wallet_list),
+            ...options
+          }, (res) => {
+            let resOptions = JSON.parse(JSON.stringify(res));
+            if(resOptions['selected_card_list1']) delete resOptions['selected_card_list1'];
+            if (resOptions['selected_card_list']){
+              resOptions['selected_card_list'] = this.filterMGinfo(resOptions['selected_card_list']);
+            }
+            this.$xdLog.setARMSInfo({
+              card_number: ticket.card_number,
+              selected_card_list_json: this.filterMGinfo(submitCardList),
+              ...options,
+              res: resOptions
+            },'select_binded_card');
+            this.$xdHideLoading();
+            const {selected_card_list, need_pay_price, is_need_pop, card_total_use_price, card_total_use_point} = res;
+            if(is_need_pop){
+              this.useCardPop(res).then((select_content) => {
+                if(select_content){
+                  this.handlerTicketSelect(true, ticket, {select_content})
+                }else{
+                  this.handlerTicketSelect(false, ticket);
+                }
+              }).catch(() => {})
+            }else{
+              this.selectedCardList = selected_card_list;
+              this.needPayPrice = need_pay_price;
+              this.cardPayPrice = card_total_use_price;
+              this.cardPayPoint = card_total_use_point;
+              this.lastUseUnit = ticket.unit == '次' ? '次' : "";
+              this.renderChecked = Date.now();
+            }
+            resolve();
+          }, (err) => {
+            this.$xdHideLoading();
             this.renderChecked = Date.now();
+            reject(err);
+          })
+        }else{
+          this.$xdLog.setARMSInfo({
+            ticket: this.filterMGinfo(ticket),
+            ...options,
+          },'cancel_card');
+          //不走接口， selectedCardList不是真实选中的
+          this.selectedCardList = this.selectedCardList.map(item => {
+            if(item.card_number == ticket.card_number){
+              this.needPayPrice = +this.needPayPrice + item['card_use_price']
+              item['card_use_price'] = 0;
+              item['card_use_point'] = 0;
+            }
+            return item;
+          });
+          if(ticket.is_new){
+            this.cardList = this.cardList.filter(item => item.card_number != ticket.card_number);
+            this.selectedCardList = this.selectedCardList.filter(item => item.card_number != ticket.card_number);
           }
-        }, (err) => {
-          this.$xdHideLoading();
+          // #ifdef MP
+          if(ticket.card_use_price) this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
+          if(ticket.card_use_point) this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
+          // #endif
+          // #ifdef H5
+          this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
+          this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
+          // #endif
+
           this.renderChecked = Date.now();
-        })
-      }else{
-        this.$xdLog.setARMSInfo({
-          ticket: this.filterMGinfo(ticket),
-          ...options,
-        },'cancel_card');
-        //不走接口， selectedCardList不是真实选中的
-        this.selectedCardList = this.selectedCardList.map(item => {
-          if(item.card_number == ticket.card_number){
-            this.needPayPrice = +this.needPayPrice + item['card_use_price']
-            item['card_use_price'] = 0;
-            item['card_use_point'] = 0;
-          }
-          return item;
-        });
-        if(ticket.is_new){
-          this.cardList = this.cardList.filter(item => item.card_number != ticket.card_number);
-          this.selectedCardList = this.selectedCardList.filter(item => item.card_number != ticket.card_number);
+          resolve();
         }
-        // #ifdef MP
-        if(ticket.card_use_price) this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
-        if(ticket.card_use_point) this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
-        // #endif
-        // #ifdef H5
-        this.cardPayPrice = this.cardPayPrice - ticket.card_use_price;
-        this.cardPayPoint = this.cardPayPoint - ticket.card_use_point;
-        // #endif
-
-        this.renderChecked = Date.now();
-      }
-
+      })
     },
 
     filterMGinfo(list){