jufubao-mall 2.0.67 → 2.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.67",
+  "version": "2.0.68",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -993,8 +993,16 @@
         this.choseCoupon = data;
         this.showCouponChose = false;
         //优惠券跟钱包同时使用，优惠券选完后，钱包默认选中第一张卡
-        if(this.is_wallet_use_with_coupon === "Y" && this.defaultUseWallet && data.isAutoTrigger){
-          if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+        if(this.is_wallet_use_with_coupon === "Y" && this.defaultUseWallet){
+          //自动选择卡券
+          if(data.isAutoTrigger){
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+          }
+          //重新选择卡券，则需清空钱包,重新选第一个钱包
+          if(data.reChoseCoupon){
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].clearChecked();
+            if(this.$refs['xdWalletChose']) this.$refs['xdWalletChose'].handleChoseDefault();
+          }
         }
       },
       handleCouponInit(coupList){
@@ -1045,12 +1053,13 @@
       },
       useBindedWallet(options, successCb, errCb){
         console.log("this.choseCard", this.choseCard)
-        const { choseCard } = this;
+        const { choseCard, choseCoupon } = this;
         let selected_card_list = choseCard ?  choseCard.selectedCardList : [];
         //苏州交投：优惠券跟钱包可同时支持
         //问题：票券跟优惠券同时存在的话，暂时都放到selected_card_list中，后续再做区分处理
         if(this.choseCoupon){
-          selected_card_list = selected_card_list.concat(this.choseCoupon.selectedCardList);
+          // selected_card_list = selected_card_list.concat(this.choseCoupon.selectedCardList);
+          selected_card_list = choseCoupon ? choseCoupon.selectedCardList : [];
         }
         let otherOptions = {};
         let fnName = "useBindedWallet";