From 709875229d0b998b9be708091e510198241a6b29 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Tue, 7 Jun 2022 16:10:15 +0800
Subject: [PATCH] 领取优惠券

---
 src/views/parkPay/coupon.vue    | 13 +++++++++----
 src/views/parkPay/couponPay.vue | 30 ++++++++++++++++--------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/views/parkPay/coupon.vue b/src/views/parkPay/coupon.vue
index 8974ee1..20ebb40 100644
--- a/src/views/parkPay/coupon.vue
+++ b/src/views/parkPay/coupon.vue
@@ -37,6 +37,7 @@ export default {
       codeType: '',
       tipText: '',
       payFlag: true,
+      couponsType:1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4：满减优惠'
     }
   },
   created() {
@@ -81,11 +82,14 @@ export default {
           this.payFlag = true
           this.imgurl = this.successiconUrl
           this.tipText = '领取优惠券成功'
+          this.couponsType = response.data.cardType
+          console.log(this.couponsType)
         } else {
-          this.payFlag = true
+          this.payFlag = false
           this.imgurl = this.loseiconUrl
           this.tipText = response.message
         }
+
         // this.tipText =
       })
     },
@@ -109,7 +113,7 @@ export default {
         pageNum: '1',
         pageSize: '1000',
         parkState: '10',
-        terminalSource: '3',
+        terminalSource: '7',
         // parkState:'10',
         carNumber: this.carNum,
         // carNumberColor: '1',
@@ -143,7 +147,7 @@ export default {
         sign_type: "md5",
         orderId: i[0].orderId,
         payOrderType: '101',
-        terminalSource: '3',
+        terminalSource: '7',
       }
       params.sign = this.$utils.signObject(params)
       appApplyParkOut(url,params).then(response => {
@@ -182,6 +186,7 @@ export default {
                   paySrcType: 101, //支付的类型   101 是本次   103是历史欠费
                   ordeID: i.orderId, //支付的订单号
                   appOrderTimeout: res.appOrderTimeout, // 超时描述
+                  couponsType:this.couponsType
                 }
               }
             )
@@ -189,7 +194,7 @@ export default {
 
         } else {
           //$('.dialog-out').show()
-          this.$msgbox('提示', '停车15分钟内无需缴费，申请成功。')
+          this.$msgbox('提示', '停车15分钟内无需缴费，请出场。')
         }
 
       })
diff --git a/src/views/parkPay/couponPay.vue b/src/views/parkPay/couponPay.vue
index de794cd..b1b39be 100644
--- a/src/views/parkPay/couponPay.vue
+++ b/src/views/parkPay/couponPay.vue
@@ -31,7 +31,7 @@
       <li>
         <span>停车优惠</span>
         <p>
-          ({{ cardTypeFormat(carType) }}) <span style="color: #3cc51f">{{ discountFee }}</span>
+          ({{ cardTypeFormat(couponsType) }}) <span style="color: #3cc51f">{{ discountFee }}</span>
         </p>
       </li>
 
@@ -85,7 +85,7 @@ export default {
       parkDuration: '',
       discountFee: 0,// 停车优惠
       carType: 1,
-
+      couponsType:1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4：满减优惠'
       orderTotalFee: 0,// 应付
       orderFee: 0,// 实付
       busDiscValue: 0,// 优惠券优惠金额
@@ -118,6 +118,7 @@ export default {
     this.appOrderTimeout = couponPark.appOrderTimeout
     this.clientBrowser = this.$utils.clientBrowser() //支付方式
     // this.paySrcType = this.$route.query.paySrcType // 实收
+    this.couponsType = this.$route.query.couponsType
     this.orderId = couponPark.orderId
     if (this.clientBrowser == "微信") {
       this.webAppCode = this.getCode();
@@ -169,7 +170,7 @@ export default {
         aliParams.orderId = this.orderId;
         aliParams.carNumber = this.carNumber;
         aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-        aliParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
+        aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
         aliParams.paySrcType = this.paySrcType;//101停车支付
         aliParams.orgId = this.$utils.myOrgId
         aliParams.backType = 2
@@ -237,7 +238,7 @@ export default {
       wxParams.backType = 2
       wxParams.orgId = this.$utils.myOrgId
       wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5   4微信公众号
-      wxParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
+      wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付
       wxParams.carNumber = this.carNumber;
       wxParams.paySrcType = this.paySrcType;//101停车支付
       wxParams.recordArreaInfos = JSON.stringify(orderIdData);
@@ -313,24 +314,25 @@ export default {
       )
     },
     cardTypeFormat: function (num) {
+      // 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4：满减优惠'
       if (num == '1') {
-        return '单次券'
+        return '按次优惠'
       }
       if (num == 2) {
-        return '时长券'
+        return '按时优惠'
       }
       if (num == 3) {
-        return '满减券'
+        return '折扣优惠'
       }
       if (num == 4) {
-        return '金额券'
-      }
-      if (num == 5) {
-        return '包天券'
-      }
-      if (num == 6) {
-        return '折扣券'
+        return '满减优惠'
       }
+      // if (num == 5) {
+      //   return '包天券'
+      // }
+      // if (num == 6) {
+      //   return '折扣券'
+      // }
     }
   },
   filters: {
--
libgit2 0.21.4