Merge branch 'fix/cash' into 'master'

Fix/cash

See merge request !9

src/views/pay/components/PayCardItem.vue

@@ -23,7 +23,7 @@
         <div v-if="showCoupon && value.payType === 1" class="coupon">
           <p class="couponDes" :class="{ disable: couponDisabled }" @click.stop="openCouponModal">
             <span v-if="couponInfo.pickupId">
-              {{ `满${couponInfo.limitAmount}减${couponInfo.faceValue}元` }}
+              {{ `满${couponInfo.limitAmountNew}减${couponInfo.faceValueNew}元` }}
             </span>
             <span v-else>
               未选择优惠券

src/views/pay/index.vue

@@ -191,9 +191,9 @@ export default {
       return this.isRiskLimit();
     },
     amount() {
-      return IS_THIRD_PAY(this.payType) || !this.selectedCoupon.faceValue
+      return IS_THIRD_PAY(this.payType) || !this.selectedCoupon.faceValueNew
         ? this.displayInfo.orderAmt
-        : (this.displayInfo.orderAmt - this.selectedCoupon.faceValue).toFixed(2);
+        : (this.displayInfo.orderAmt - this.selectedCoupon.faceValueNew).toFixed(2);
     },
     isShowProtocol() {
       return (
@@ -204,7 +204,7 @@ export default {
     },
     canUseAmount() {
       return (
-        ((this.selectedCoupon?.faceValue && +this.selectedCoupon.faceValue) || 0) +
+        ((this.selectedCoupon?.faceValueNew && +this.selectedCoupon.faceValueNew) || 0) +
         ((this.displayInfo?.creditPayInfo?.canAmt && +this.displayInfo.creditPayInfo.canAmt) || 0) -
         ((this.displayInfo?.orderAmt && +this.displayInfo.orderAmt) || 0)
       );
@@ -327,7 +327,7 @@ export default {
       const { accountStatus, riskManagementAmt } = this.creditPayInfo;
       const { orderAmt } = this.displayInfo;
       if (accountStatus === ACCOUNT_APPLY_SUCCESS) {
-        const coupon = +this.selectedCoupon.faceValue || 0;
+        const coupon = +this.selectedCoupon.faceValueNew || 0;
         return +riskManagementAmt + coupon < +orderAmt;
       } else {
         return false;
@@ -537,6 +537,12 @@ export default {
         coupon_id: id
       });
       this.selectedCoupon = selectedCoupon || {};
+      if (!('faceValueNew' in this.selectedCoupon) && 'faceValue' in this.selectedCoupon) {
+        this.selectedCoupon.faceValueNew = this.selectedCoupon.faceValue;
+      }
+      if (!('limitAmountNew' in this.selectedCoupon) && 'limitAmount' in this.selectedCoupon) {
+        this.selectedCoupon.limitAmountNew = this.selectedCoupon.limitAmount;
+      }
       this.getBtnStatus(this.isRiskLimit());
       this.couponPopup = false;
     },
@@ -599,7 +605,7 @@ export default {
       return Object.keys(obj);
     },
     setAmount() {
-      const faceValue = +this.selectedCoupon?.faceValue || 0;
+      const faceValue = +this.selectedCoupon?.faceValueNew || 0;
       const orderAmt = +this.displayInfo?.orderAmt || 0;
       const finalAmt =
         IS_THIRD_PAY(this.payType) || !this.showCoupon