gxd-uni-library-editx 1.0.60 → 1.0.62

package/package.json

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

package/src/components/XdCardPayChose/XdCardPayChose.vue

@@ -94,6 +94,11 @@
             </view>
 
           </view>
+
+          <view class="ticket_add_new" @click="xdDownDrawerNewCard=true">
+            <view class="plus_icon">+</view>
+            <view>使用新票券</view>
+          </view>
         </view>
         <view style="height: 100rpx;"></view>
         <view
@@ -228,10 +233,14 @@ export default {
       type: Array,
       default: () => ([])
     },
-    price: {  //订单总额 单位元
+    orderTotalPrice: {  //订单总额 单位元
       type: String|Number,
       default: "100"
     },
+    orderNeedPayPrice:{
+      type: String | Number,
+      default: "100"
+    },
     jwxSDK: { //JSSDK授权对象
       type: Object,
     },
@@ -252,11 +261,14 @@ export default {
     xdDownDrawer(n){
       this.$emit('update:show', n);
     },
-    price: {
+    orderTotalPrice: {
       handler(n){
-        this.needPayPrice = this.$xdUniHelper.multiplyFloatNumber(n, 100);
-      },
-      immediate: true
+        this.clearChecked();
+      }
+    },
+    orderNeedPayPrice(n, o){
+      console.log("orderNeedPayPrice", n)
+      this.needPayPrice = n;
     },
     xdDownDrawerNewCard(n){
       if(!n){
@@ -315,6 +327,7 @@ export default {
     alert_bottom(){
       return this.fixedStyle({paddingBottom: 24, zIndex: 110})
     },
+    
   },
   async created(){
     this.switchValidToken();
@@ -324,7 +337,7 @@ export default {
   },
   methods: {
     handleInit(){
-      this.total_price = this.$xdUniHelper.multiplyFloatNumber(this.price, 100);
+      this.total_price = this.$xdUniHelper.multiplyFloatNumber(this.orderTotalPrice, 100);
       this.needPayPrice = this.total_price;
       this.getList();
       this.selectedCardList = this.selectedCardList.map(item => {
@@ -332,6 +345,17 @@ export default {
         return item;
       })
     },
+    clearChecked(){
+      console.log("xdCardPayChose", this.orderTotalPrice)
+      this.total_price = this.$xdUniHelper.multiplyFloatNumber(this.orderTotalPrice, 100);
+      this.needPayPrice = this.total_price;
+      this.cardPayPrice = 0;
+      this.selectedCardList = this.selectedCardList.map(item => {
+        item['card_use_point'] = 0;
+        return item;
+      })
+      this.doTicketPay();
+    },
     divideFloatNumber(num){
       return this.$xdUniHelper.divisionFloatNumber(num, 100);
     },
@@ -440,7 +464,7 @@ export default {
           }else{
             this.selectedCardList = selected_card_list;
             this.needPayPrice = need_pay_price;
-            this.cardPayPrice = card_total_use_price
+            this.cardPayPrice = card_total_use_price;
             this.renderChecked = Date.now();
           }
         }, (err) => {
@@ -535,7 +559,7 @@ export default {
         this.$xdHideLoading();
         
         //成功回调
-        let {selected_card_list=[], need_pay_price, is_need_pop} = res;
+        let {selected_card_list=[], need_pay_price, is_need_pop, card_total_use_price} = res;
         
         if(is_need_pop){
           this.useCardPop(res).then((select_content) => {
@@ -578,6 +602,7 @@ export default {
           this.cardList = selected_card_list.concat(this.cardList);
           this.selectedCardList = selected_card_list.concat(this.selectedCardList);
           this.needPayPrice = need_pay_price;
+          this.cardPayPrice = card_total_use_price
         }
         this.xdDownDrawerNewCard = false;
         this.renderChecked = Date.now();
@@ -699,6 +724,33 @@ export default {
       }
 
       .ticket_list{
+        .ticket_add_new{
+          width: 690rpx;
+          height: 220rpx;
+          border-radius: 10rpx;
+          background: rgba(255, 255, 255, 1);
+          box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.1);
+          margin: 30rpx auto;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          font-size: 24rpx;
+          color: var(--main-color);
+
+          .plus_icon{
+            background-color: var(--main-color);
+            color: #FFFFFF;
+            border-radius: 20rpx;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            font-size: 48rpx;
+            width: 80rpx;
+            height: 80rpx;
+            margin-bottom: 20rpx;
+          }
+        }
         .ticket_item{
           width: 690rpx;
           border-radius: 10rpx;

package/src/components/XdWalletChose/XdWalletChose.vue

@@ -70,7 +70,7 @@
       showWalletList(){
         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);
+          if(cur) return Object.assign({}, item, cur);
           return item;
         })
         return combineList;
@@ -103,6 +103,11 @@
       })
     },
     methods: {
+      clearChecked(){
+        this.walletPayPrice = 0;
+        this.selectedWalletList = []
+        this.handleChose();
+      },
       handleChose(){
         let data = {
           walletPayPrice: this.walletPayPrice,