gxd-uni-library-editx 1.0.63 → 1.0.65

package/package.json

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

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="xd-card-pay">
     <slot></slot>
-    <xd-down-drawer :show.sync="xdDownDrawer"
+    <xd-down-drawer :show.sync="xdDownDrawer" :isBodyClose="false"
       :z-index="3000">
       <view style="height: 80rpx;background:#FFF;"></view>
       <view class="jfb-cashier-verification-pay__body">
@@ -253,14 +253,32 @@ export default {
     addSettleCard: {  //添加卡券
       type: Function
     },
+    hadChoseCard: {
+      type: null | Array,
+    }
   },
   watch: {
     show(n, o){
       this.xdDownDrawer = n;
     },
-    xdDownDrawer(n){
+    xdDownDrawer(n, o){
+      console.log('xdDownDrawer value', n, o);
+      if(n){
+        console.log(this.hadChoseCard);
+        let checkedArr = (this.hadChoseCard || []).map(c => c.card_number);
+        this.selectedCardList = this.selectedCardList.map(item => {
+          if(!checkedArr.includes(item.card_number)){
+            this.needPayPrice = +this.needPayPrice + item['card_use_price'];
+            this.cardPayPrice = this.cardPayPrice - item.card_use_price;
+            item['card_use_point'] = 0;
+          }
+          return item;
+        })
+
+      }
       this.$emit('update:show', n);
-      this.$emit("onAlert")
+      this.$emit("onAlert");
+      
     },
     orderTotalPrice: {
       handler(n){
@@ -840,4 +858,4 @@ export default {
       }
     }
   }
-</style>
+</style>

package/src/components/XdWalletChose/XdWalletChose.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="xd-wallet-chose">
-    <xd-down-drawer :show.sync="xdDownDrawer">
+    <xd-down-drawer :show.sync="xdDownDrawer" :isBodyClose="false">
       <view class="title" >请选择{{showName}}</view>
       <view class="wallet_body">
         <view class="wallet_total">
@@ -56,13 +56,32 @@
       },
       useBindedWallet: {
         type: Function
+      },
+      hadChoseWallet:{
+        type: null | Array
       }
     },
     watch: {
       show(n, o){
         this.xdDownDrawer = n;
       },
-      xdDownDrawer(n){
+      xdDownDrawer(n, o){
+        console.log('xdDownDrawer show', n, o, this.hadChoseWallet);
+        if(n){
+          if(!this.hadChoseWallet){
+            this.selectedWalletList =  [];
+            this.walletPayPrice = 0;
+          }else{
+            let checkedArr = this.hadChoseWallet.map(w => w.wallet_virtual_number);
+            this.selectedWalletList = this.selectedWalletList.map(item => {
+               if(!checkedArr.includes(item.wallet_virtual_number)){
+                this.walletPayPrice = this.walletPayPrice - item.wallet_use_price;
+                item['wallet_use_price'] = 0;
+               }
+               return item;
+            });
+          }
+        }
         this.$emit('update:show', n);
       },
     },
@@ -71,6 +90,7 @@
         let combineList = this.walletList.map(item => {
           let cur = this.selectedWalletList.find(ii => ii.wallet_virtual_number == item.wallet_virtual_number);
           if(cur) return Object.assign({}, item, cur);
+          else item['wallet_use_price'] = 0;
           return item;
         })
         return combineList;
@@ -141,7 +161,7 @@
             return item.wallet_virtual_number != row.wallet_virtual_number
           })
           this.walletPayPrice = this.walletPayPrice - row.wallet_use_price;
-          this.$set(row, "wallet_use_price",  0);
+          // this.$set(row, "wallet_use_price",  0);
         }
       },
       fixedStyle(options = {}, type = 'bottom') {