Merge pull request #350 from John-Hong/John/release-2.21.0/KIP-13164

fix(SCRM-5213): 补充后台推送的错误提示，并加引导

.gitignore

@@ -2,6 +2,7 @@
 node_modules/
 unpackage/
 dist/
+src/api/mockData/*
 
 # local env files
 .env.local

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -207,10 +207,9 @@ export default {
         }
       }, 10000)
       const { parkingRecord, discountInfo = {}, parkingRule = {}, parkInfo = {}} = this.orderDetail;
-      const { coupons, points, memberGrade = [], paperCoupons = [], consume = [], newMemberPoints = {} } = discountInfo
+      const { coupons = [], points = [], memberGrade = [], paperCoupons = [], consume = [], newMemberPoints = {} } = discountInfo
       const { hourPrice } = parkingRule
       try {
-        const unlicensed = parkingRecord.vehicleNo.indexOf('临') > -1 || !parkingRecord.vehicleNo;
         const params = {
           // vehicleNo: '', // 车牌号
           // points
@@ -310,6 +309,7 @@ export default {
             })
          }
         console.log('下单时的参数', params);
+        const unlicensed = parkingRecord.vehicleNo.indexOf('临') > -1; // true: 临时车牌；false：燃油车牌
         const res = await ordersAndPrepay({
           params, 
           unlicensed,
@@ -370,8 +370,9 @@ export default {
           // 如果接口返回异常，重置当前页面数据
           console.log('err::::', err)
           if (err.code !=='NO_FEE_NEED_TO_PAY') {
-            console.log('bbbb')
-            this.reCreateParkOrder()
+            this.reCreateParkOrder(err.langMessage)
+          } else if(['ETCP_RECORD_COUPON_FAILED', 'ETCP_COUPON_CONFIG_EXCEPTION', 'ETCP_COUPON_INSUFFICIENT_STOCK', 'ETCP_RECORD_COUPON_FAILED', 'ETCP_PUSH_DISCOUNT_FAILED', 'WRONG_AMOUNT'].indexOf(err.code) > -1) {
+            this.reCreateParkOrder(err.langMessage)
           } else {
             Dialog.alert({
               title: '提示',

src/pages/parkingFeeV2/mixins/parkingFeeDetail.js

@@ -273,7 +273,7 @@ export default {
         }
       }, 10000)
       const { parkingRecord, discountInfo = {}, parkingRule = {}, parkInfo = {}} = this.orderDetail;
-      const { coupons, points, memberGrade = [], paperCoupons = [], consume = [], newMemberPoints= {} } = discountInfo
+      const { coupons = [], points = [], memberGrade = [], paperCoupons = [], consume = [], newMemberPoints= {} } = discountInfo
       const { hourPrice } = parkingRule
       try {
         const params = {
@@ -437,9 +437,9 @@ export default {
           console.log('err::::', err)
           if (err.code !=='NO_FEE_NEED_TO_PAY') {
             this.reCreateParkOrder(err.langMessage)
-          } else if(['ETCP_RECORD_COUPON_FAILED', 'ETCP_COUPON_CONFIG_EXCEPTION', 'ETCP_COUPON_INSUFFICIENT_STOCK', 'ETCP_RECORD_COUPON_FAILED', 'ETCP_PUSH_DISCOUNT_FAILED'].indexOf(err.code) > -1) {
+          } else if(['ETCP_RECORD_COUPON_FAILED', 'ETCP_COUPON_CONFIG_EXCEPTION', 'ETCP_COUPON_INSUFFICIENT_STOCK', 'ETCP_RECORD_COUPON_FAILED', 'ETCP_PUSH_DISCOUNT_FAILED', 'WRONG_AMOUNT'].indexOf(err.code) > -1) {
             this.reCreateParkOrder(err.langMessage)
-          }else {
+          } else {
             Dialog.alert({
               title: '提示',
               message: '当前无需缴费',