Commit 709875229d0b998b9be708091e510198241a6b29

Authored by 刘淇
1 parent 7e244ba4

领取优惠券

src/views/parkPay/coupon.vue
@@ -37,6 +37,7 @@ export default { @@ -37,6 +37,7 @@ export default {
37 codeType: '', 37 codeType: '',
38 tipText: '', 38 tipText: '',
39 payFlag: true, 39 payFlag: true,
  40 + couponsType:1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4:满减优惠'
40 } 41 }
41 }, 42 },
42 created() { 43 created() {
@@ -81,11 +82,14 @@ export default { @@ -81,11 +82,14 @@ export default {
81 this.payFlag = true 82 this.payFlag = true
82 this.imgurl = this.successiconUrl 83 this.imgurl = this.successiconUrl
83 this.tipText = '领取优惠券成功' 84 this.tipText = '领取优惠券成功'
  85 + this.couponsType = response.data.cardType
  86 + console.log(this.couponsType)
84 } else { 87 } else {
85 - this.payFlag = true 88 + this.payFlag = false
86 this.imgurl = this.loseiconUrl 89 this.imgurl = this.loseiconUrl
87 this.tipText = response.message 90 this.tipText = response.message
88 } 91 }
  92 +
89 // this.tipText = 93 // this.tipText =
90 }) 94 })
91 }, 95 },
@@ -109,7 +113,7 @@ export default { @@ -109,7 +113,7 @@ export default {
109 pageNum: '1', 113 pageNum: '1',
110 pageSize: '1000', 114 pageSize: '1000',
111 parkState: '10', 115 parkState: '10',
112 - terminalSource: '3', 116 + terminalSource: '7',
113 // parkState:'10', 117 // parkState:'10',
114 carNumber: this.carNum, 118 carNumber: this.carNum,
115 // carNumberColor: '1', 119 // carNumberColor: '1',
@@ -143,7 +147,7 @@ export default { @@ -143,7 +147,7 @@ export default {
143 sign_type: "md5", 147 sign_type: "md5",
144 orderId: i[0].orderId, 148 orderId: i[0].orderId,
145 payOrderType: '101', 149 payOrderType: '101',
146 - terminalSource: '3', 150 + terminalSource: '7',
147 } 151 }
148 params.sign = this.$utils.signObject(params) 152 params.sign = this.$utils.signObject(params)
149 appApplyParkOut(url,params).then(response => { 153 appApplyParkOut(url,params).then(response => {
@@ -182,6 +186,7 @@ export default { @@ -182,6 +186,7 @@ export default {
182 paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 186 paySrcType: 101, //支付的类型 101 是本次 103是历史欠费
183 ordeID: i.orderId, //支付的订单号 187 ordeID: i.orderId, //支付的订单号
184 appOrderTimeout: res.appOrderTimeout, // 超时描述 188 appOrderTimeout: res.appOrderTimeout, // 超时描述
  189 + couponsType:this.couponsType
185 } 190 }
186 } 191 }
187 ) 192 )
@@ -189,7 +194,7 @@ export default { @@ -189,7 +194,7 @@ export default {
189 194
190 } else { 195 } else {
191 //$('.dialog-out').show() 196 //$('.dialog-out').show()
192 - this.$msgbox('提示', '停车15分钟内无需缴费,申请成功。') 197 + this.$msgbox('提示', '停车15分钟内无需缴费,请出场。')
193 } 198 }
194 199
195 }) 200 })
src/views/parkPay/couponPay.vue
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <li> 31 <li>
32 <span>停车优惠</span> 32 <span>停车优惠</span>
33 <p> 33 <p>
34 - ({{ cardTypeFormat(carType) }}) <span style="color: #3cc51f">{{ discountFee }}</span> 34 + ({{ cardTypeFormat(couponsType) }}) <span style="color: #3cc51f">{{ discountFee }}</span>
35 </p> 35 </p>
36 </li> 36 </li>
37 37
@@ -85,7 +85,7 @@ export default { @@ -85,7 +85,7 @@ export default {
85 parkDuration: '', 85 parkDuration: '',
86 discountFee: 0,// 停车优惠 86 discountFee: 0,// 停车优惠
87 carType: 1, 87 carType: 1,
88 - 88 + couponsType:1,// 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4:满减优惠'
89 orderTotalFee: 0,// 应付 89 orderTotalFee: 0,// 应付
90 orderFee: 0,// 实付 90 orderFee: 0,// 实付
91 busDiscValue: 0,// 优惠券优惠金额 91 busDiscValue: 0,// 优惠券优惠金额
@@ -118,6 +118,7 @@ export default { @@ -118,6 +118,7 @@ export default {
118 this.appOrderTimeout = couponPark.appOrderTimeout 118 this.appOrderTimeout = couponPark.appOrderTimeout
119 this.clientBrowser = this.$utils.clientBrowser() //支付方式 119 this.clientBrowser = this.$utils.clientBrowser() //支付方式
120 // this.paySrcType = this.$route.query.paySrcType // 实收 120 // this.paySrcType = this.$route.query.paySrcType // 实收
  121 + this.couponsType = this.$route.query.couponsType
121 this.orderId = couponPark.orderId 122 this.orderId = couponPark.orderId
122 if (this.clientBrowser == "微信") { 123 if (this.clientBrowser == "微信") {
123 this.webAppCode = this.getCode(); 124 this.webAppCode = this.getCode();
@@ -169,7 +170,7 @@ export default { @@ -169,7 +170,7 @@ export default {
169 aliParams.orderId = this.orderId; 170 aliParams.orderId = this.orderId;
170 aliParams.carNumber = this.carNumber; 171 aliParams.carNumber = this.carNumber;
171 aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 172 aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号
172 - aliParams.terminalSource = 3;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 173 + aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付
173 aliParams.paySrcType = this.paySrcType;//101停车支付 174 aliParams.paySrcType = this.paySrcType;//101停车支付
174 aliParams.orgId = this.$utils.myOrgId 175 aliParams.orgId = this.$utils.myOrgId
175 aliParams.backType = 2 176 aliParams.backType = 2
@@ -237,7 +238,7 @@ export default { @@ -237,7 +238,7 @@ export default {
237 wxParams.backType = 2 238 wxParams.backType = 2
238 wxParams.orgId = this.$utils.myOrgId 239 wxParams.orgId = this.$utils.myOrgId
239 wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 240 wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号
240 - wxParams.terminalSource = 3;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 241 + wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付
241 wxParams.carNumber = this.carNumber; 242 wxParams.carNumber = this.carNumber;
242 wxParams.paySrcType = this.paySrcType;//101停车支付 243 wxParams.paySrcType = this.paySrcType;//101停车支付
243 wxParams.recordArreaInfos = JSON.stringify(orderIdData); 244 wxParams.recordArreaInfos = JSON.stringify(orderIdData);
@@ -313,24 +314,25 @@ export default { @@ -313,24 +314,25 @@ export default {
313 ) 314 )
314 }, 315 },
315 cardTypeFormat: function (num) { 316 cardTypeFormat: function (num) {
  317 + // 1:按次优惠,2:按时优惠,3:折扣优惠(打折),4:满减优惠'
316 if (num == '1') { 318 if (num == '1') {
317 - return '单次券' 319 + return '按次优惠'
318 } 320 }
319 if (num == 2) { 321 if (num == 2) {
320 - return '时长券' 322 + return '按时优惠'
321 } 323 }
322 if (num == 3) { 324 if (num == 3) {
323 - return '满减券' 325 + return '折扣优惠'
324 } 326 }
325 if (num == 4) { 327 if (num == 4) {
326 - return '金额券'  
327 - }  
328 - if (num == 5) {  
329 - return '包天券'  
330 - }  
331 - if (num == 6) {  
332 - return '折扣券' 328 + return '满减优惠'
333 } 329 }
  330 + // if (num == 5) {
  331 + // return '包天券'
  332 + // }
  333 + // if (num == 6) {
  334 + // return '折扣券'
  335 + // }
334 } 336 }
335 }, 337 },
336 filters: { 338 filters: {