Commit 6a633a7d115a64243690fd99a4d8b65b86208832
1 parent
442c6d46
出场结算页面 新建输入框
Showing
3 changed files
with
121 additions
and
17 deletions
config.js
... | ... | @@ -34,7 +34,8 @@ webAppH5.dynCode = {//卫岗固定参数 |
34 | 34 | |
35 | 35 | /*出、入场接口*/ |
36 | 36 | webAppH5.comServer = "/keyTopQrCodeInOutPark/noCarQRcodeInOutPark"; |
37 | - | |
37 | +/*优惠券*/ | |
38 | +webAppH5.discountServer = "/keyTopQrCodeInOutPark/useCouponQueryFee"; | |
38 | 39 | //缴费-微信 |
39 | 40 | webAppH5.wxPayServer = "/weixinpay/publicUnifiedOrder"; |
40 | 41 | ... | ... |
js/pay.js
... | ... | @@ -6,12 +6,15 @@ |
6 | 6 | var webAppParams = null; |
7 | 7 | var $btnObj = null; |
8 | 8 | var $btnLoad = null; |
9 | +var flag = 0; | |
9 | 10 | var webAppCode = null;//如果是微信,先获取微信code |
10 | 11 | //var $btnLoad = document.getElementById("loading"); |
11 | 12 | window.onload = function () { |
12 | 13 | //var root = document.getElementById("root"); |
13 | 14 | $btnObj = document.getElementById("btnPayOK"); |
14 | 15 | $btnLoad = document.getElementById("loading"); |
16 | + | |
17 | + $discountBtn = document.getElementById("discountBtn"); | |
15 | 18 | $linkPayDetail = getObjectByID("linkPayDetail"); |
16 | 19 | $linkPayDetail.onclick = webAppClass.linkPayDetailClick; |
17 | 20 | var webRoot = window.location.href; |
... | ... | @@ -39,9 +42,98 @@ window.onload = function () { |
39 | 42 | if (state == "wxPay") { |
40 | 43 | webAppCode = webAppClass.getCode(); |
41 | 44 | } |
45 | + $discountBtn.onclick = webAppClass.discountClick; | |
42 | 46 | } |
43 | 47 | /**/ |
44 | 48 | var webAppClass = { |
49 | + //优惠券兑换 | |
50 | + discountClick1:function(tmpObj){ | |
51 | + discountVal = document.getElementById("discountBox").value; | |
52 | + // console.log(discountVal) | |
53 | + // console.log(discountVal.length) | |
54 | + if(discountVal.length > 0){ | |
55 | + $btnObj.style.display = "none"; | |
56 | + $btnLoad.style.display = "block"; | |
57 | + $discountBtn.disabled = true | |
58 | + console.log(webAppParams.orderId) | |
59 | + var url = webAppRoot + window.webAppH5.discountServer; | |
60 | + var discountParams = { | |
61 | + app_id:'1', | |
62 | + salt:'1', | |
63 | + deviceInfo:'1', | |
64 | + sign_type:'1', | |
65 | + sign:'1', | |
66 | + token:'1', | |
67 | + terminalSource:7, | |
68 | + orderId:webAppParams.orderId, | |
69 | + cardNo:discountVal, | |
70 | + codeType:0 | |
71 | + } | |
72 | + postRequest(url, discountParams, function (res) { | |
73 | + console.log(res) | |
74 | + if(res.code==0){ | |
75 | + | |
76 | + document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100) | |
77 | + document.getElementById("discountTip").innerHTML = res.data.couponDescribe | |
78 | + document.getElementById("discountFee").innerHTML = (res.data.discountFee/100) | |
79 | + document.getElementById("discountDesc").style.display="none" | |
80 | + $btnLoad.style.display = "none"; | |
81 | + $btnObj.style.display = "block"; | |
82 | + flag = 1 | |
83 | + //webAppClass.okPay(tmpObj);//唤醒支付 | |
84 | + }else{ | |
85 | + $discountBtn.disabled = false | |
86 | + document.getElementById("discountTip").innerHTML = res.message | |
87 | + } | |
88 | + }) | |
89 | + | |
90 | + }else{ | |
91 | + return | |
92 | + } | |
93 | + }, | |
94 | + discountClick: function(){ | |
95 | + discountVal = document.getElementById("discountBox").value; | |
96 | + // console.log(discountVal) | |
97 | + // console.log(discountVal.length) | |
98 | + if(discountVal.length > 0){ | |
99 | + $btnObj.style.display = "none"; | |
100 | + $btnLoad.style.display = "block"; | |
101 | + $discountBtn.disabled = true | |
102 | + console.log(webAppParams.orderId) | |
103 | + var url = webAppRoot + window.webAppH5.discountServer; | |
104 | + var discountParams = { | |
105 | + app_id:'1', | |
106 | + salt:'1', | |
107 | + deviceInfo:'1', | |
108 | + sign_type:'1', | |
109 | + sign:'1', | |
110 | + token:'1', | |
111 | + terminalSource:7, | |
112 | + orderId:webAppParams.orderId, | |
113 | + cardNo:discountVal, | |
114 | + codeType:0 | |
115 | + } | |
116 | + postRequest(url, discountParams, function (res) { | |
117 | + console.log(res) | |
118 | + if(res.code==0){ | |
119 | + | |
120 | + document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100) | |
121 | + document.getElementById("discountTip").innerHTML = res.data.couponDescribe | |
122 | + document.getElementById("discountFee").innerHTML = (res.data.discountFee/100) | |
123 | + document.getElementById("discountDesc").style.display="none" | |
124 | + $btnLoad.style.display = "none"; | |
125 | + $btnObj.style.display = "block"; | |
126 | + flag = 1 | |
127 | + }else{ | |
128 | + $discountBtn.disabled = false | |
129 | + document.getElementById("discountTip").innerHTML = res.message | |
130 | + } | |
131 | + }) | |
132 | + | |
133 | + }else{ | |
134 | + return | |
135 | + } | |
136 | + }, | |
45 | 137 | //OK |
46 | 138 | okClick: function (ev) { |
47 | 139 | document.getElementById("payTip").innerHTML = ""; |
... | ... | @@ -66,9 +158,16 @@ var webAppClass = { |
66 | 158 | if (res.code == 0) {//进场 |
67 | 159 | var tmpObj = res.data; |
68 | 160 | if (tmpObj) { |
69 | - webAppClass.setUI(tmpObj); | |
70 | - webAppParams = tmpObj;//重新赋值 | |
71 | - webAppClass.okPay(tmpObj);//唤醒支付 | |
161 | + if(flag == 1){ | |
162 | + webAppClass.discountClick1(tmpObj); | |
163 | + }else{ | |
164 | + webAppClass.setUI(tmpObj); | |
165 | + webAppParams = tmpObj;//重新赋值 | |
166 | + webAppClass.okPay(tmpObj);//唤醒支付 | |
167 | + } | |
168 | + | |
169 | + console.log(tmpObj) | |
170 | + // webAppClass.okPay(tmpObj);//唤醒支付 | |
72 | 171 | } else { |
73 | 172 | alertMsg("没有找到相应订单"); |
74 | 173 | } |
... | ... | @@ -264,7 +363,7 @@ var webAppClass = { |
264 | 363 | //0:页面初始化获取code[webAppCode] |
265 | 364 | var codeParams = { code: webAppCode, appId: appWxID }; |
266 | 365 | var openIdUrl = webAppRoot + window.webAppH5.wxGetOpenIdServer; |
267 | - | |
366 | + | |
268 | 367 | //1:有code获取OpenId |
269 | 368 | postRequest(openIdUrl, codeParams, function (res) { |
270 | 369 | //alert(JSON.stringify(res)); |
... | ... | @@ -290,7 +389,7 @@ var webAppClass = { |
290 | 389 | }); |
291 | 390 | //2:获取支付参数 |
292 | 391 | //function getPayParams(openId) { |
293 | - | |
392 | + | |
294 | 393 | //} |
295 | 394 | }, |
296 | 395 | getPayParams: function (openId, orderID) { |
... | ... | @@ -337,12 +436,12 @@ var webAppClass = { |
337 | 436 | WeixinJSBridge.invoke( |
338 | 437 | 'getBrandWCPayRequest', params, |
339 | 438 | //'getBrandWCPayRequest', { |
340 | - // "appId": appWxID, //公众号名称,由商户传入 | |
341 | - // "timeStamp": "1395712654", //时间戳,自1970年以来的秒数 | |
342 | - // "nonceStr": "e61463f8efa94090b1f366cccfbbb444", //随机串 | |
439 | + // "appId": appWxID, //公众号名称,由商户传入 | |
440 | + // "timeStamp": "1395712654", //时间戳,自1970年以来的秒数 | |
441 | + // "nonceStr": "e61463f8efa94090b1f366cccfbbb444", //随机串 | |
343 | 442 | // "package": "prepay_id=u802345jgfjsdfgsdg888", |
344 | - // "signType": "MD5", //微信签名方式: | |
345 | - // "paySign": "70EA570631E4BB79628FBCA90534C63FF7FADD89" //微信签名 | |
443 | + // "signType": "MD5", //微信签名方式: | |
444 | + // "paySign": "70EA570631E4BB79628FBCA90534C63FF7FADD89" //微信签名 | |
346 | 445 | //}, |
347 | 446 | function (res) { |
348 | 447 | //alert(res.err_msg); |
... | ... | @@ -393,6 +492,7 @@ var webAppClass = { |
393 | 492 | |
394 | 493 | //设置UI |
395 | 494 | setUI: function (params) { |
495 | + console.log('ui') | |
396 | 496 | var $carNum = getObjectByID("carNum"),//车牌号 |
397 | 497 | $orderNum = getObjectByID("orderNum"),//订单号 |
398 | 498 | $sumMoney = getObjectByID("sumMoney"),//实际应付金额 |
... | ... | @@ -420,7 +520,7 @@ var webAppClass = { |
420 | 520 | $parkName.innerHTML = params.parkName; |
421 | 521 | $inparktime.innerHTML = params.inparktime; |
422 | 522 | $staytime.innerHTML = formatSeconds(params.staytime); |
423 | - | |
523 | + | |
424 | 524 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 |
425 | 525 | $paid.innerHTML = params.paid; |
426 | 526 | $discountFee.innerHTML = keepTwoDecimalFull((params.discountFee / 100));//优惠金额 |
... | ... | @@ -442,4 +542,4 @@ var webAppClass = { |
442 | 542 | $payDetail.style.height = "55px"; |
443 | 543 | } |
444 | 544 | } |
445 | -} | |
446 | 545 | \ No newline at end of file |
546 | +} | ... | ... |
pay.html
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | <meta http-equiv="Expires" content="0"> |
16 | 16 | <link rel="stylesheet" href="css/index.css?v=0.1"> |
17 | 17 | <script src="config.js?v=0.1"></script> |
18 | - <script src="js/common.js?v=0.11"></script> | |
18 | + <script src="js/common.js?v=1.11"></script> | |
19 | 19 | <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>--> |
20 | 20 | <script src="js/pay.js?v=0.120"></script> |
21 | 21 | <!--<script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>--> |
... | ... | @@ -43,6 +43,7 @@ |
43 | 43 | display: inline-block; |
44 | 44 | float: left; |
45 | 45 | color: #8a8a8a; |
46 | + font-size: 14px; | |
46 | 47 | } |
47 | 48 | .discountBox:focus{ |
48 | 49 | border: 0; |
... | ... | @@ -63,6 +64,8 @@ |
63 | 64 | background: #fff; |
64 | 65 | } |
65 | 66 | .discount-tip{ |
67 | + padding-top: 10px; | |
68 | + font-size: 14px; | |
66 | 69 | color: #EB453B; |
67 | 70 | } |
68 | 71 | </style> |
... | ... | @@ -88,10 +91,10 @@ |
88 | 91 | </section> |
89 | 92 | <div class="row marginTop"> |
90 | 93 | <div style="overflow: hidden"> |
91 | - <input class="discountBox" type="text" placeholder="请输入优惠券编号" maxlength="20"> | |
92 | - <button class="discountBtn">兑换</button> | |
94 | + <input class="discountBox" id="discountBox" type="text" placeholder="请输入优惠券编号" maxlength="20"> | |
95 | + <button class="discountBtn" id="discountBtn">兑换</button> | |
93 | 96 | </div> |
94 | - <div class="discount-tip">注意:</div> | |
97 | + <div class="discount-tip" id="discountTip"></div> | |
95 | 98 | </div> |
96 | 99 | <section id="section" class="marginTop"> |
97 | 100 | <div class="flexBoxRow" > | ... | ... |