Commit ddf3f6a379747aded64196c214e735825d23353f
1 parent
f0cfce54
支付宝
Showing
6 changed files
with
24 additions
and
16 deletions
home.html
@@ -33,7 +33,7 @@ | @@ -33,7 +33,7 @@ | ||
33 | <div><span>停车时长:</span><span id="staytime"></span></div> | 33 | <div><span>停车时长:</span><span id="staytime"></span></div> |
34 | <div><span>进场时间:</span><span id="inparktime"></span></div> | 34 | <div><span>进场时间:</span><span id="inparktime"></span></div> |
35 | <div><span>停车总费用:</span><span id="due"></span></div> | 35 | <div><span>停车总费用:</span><span id="due"></span></div> |
36 | - <div id="businessFeeWrap"><span>商户优惠减免:</span><span id="businessFee"></span></div> | 36 | + <!--<div id="businessFeeWrap"><span>商户优惠减免:</span><span id="businessFee"></span></div>--> |
37 | <div><span>已支付金额:</span><span id="paid"></span></div> | 37 | <div><span>已支付金额:</span><span id="paid"></span></div> |
38 | <div><span>优惠金额:</span><span id="discountFee"></span><span id="discountDesc"></span></div> | 38 | <div><span>优惠金额:</span><span id="discountFee"></span><span id="discountDesc"></span></div> |
39 | <div><span>订单编号: </span><span id="orderNum">1234567890</span> </div> | 39 | <div><span>订单编号: </span><span id="orderNum">1234567890</span> </div> |
js/config.js
@@ -7,11 +7,13 @@ window.webAppH5 = {}; | @@ -7,11 +7,13 @@ window.webAppH5 = {}; | ||
7 | 7 | ||
8 | 8 | ||
9 | /*服务器地址*/ | 9 | /*服务器地址*/ |
10 | - var webAppRoot = "http://pay.service.huangshiparking.com"; | 10 | +// |
11 | +// http://pay.service.huangshiparking.com | ||
12 | + var webAppRoot = "http://pay.service.renniting.cn/v1"; | ||
11 | //test 测试环境 | 13 | //test 测试环境 |
12 | // var webAppRoot = "http://39.98.54.240:8090"; | 14 | // var webAppRoot = "http://39.98.54.240:8090"; |
13 | //微信支付结果回调地址 | 15 | //微信支付结果回调地址 |
14 | -var webAppPayResult = "http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/wxpayResult.html"; | 16 | +var webAppPayResult = "http://wxgzh.renniting.cn/xcscan/PDA-Payment/wxpayResult.html"; |
15 | 17 | ||
16 | /*公共参数*/ | 18 | /*公共参数*/ |
17 | webAppH5.comParams = { | 19 | webAppH5.comParams = { |
js/listnew.js
@@ -403,8 +403,8 @@ function getOneorder(carNumber, parkCode, orderId, _paySrcType) { | @@ -403,8 +403,8 @@ function getOneorder(carNumber, parkCode, orderId, _paySrcType) { | ||
403 | + '&appId=' + datas.appId | 403 | + '&appId=' + datas.appId |
404 | + '&orderId=' + datas.orderId | 404 | + '&orderId=' + datas.orderId |
405 | + '&_paySrcType=' + _paySrcType | 405 | + '&_paySrcType=' + _paySrcType |
406 | - + "&businessUsedType=" + businessUsedType | ||
407 | - + "&businessFee=" + businessFee | 406 | + // + "&businessUsedType=" + businessUsedType |
407 | + // + "&businessFee=" + businessFee | ||
408 | console.log(src) | 408 | console.log(src) |
409 | window.location.assign(encodeURI(src)) | 409 | window.location.assign(encodeURI(src)) |
410 | }, 100); | 410 | }, 100); |
js/pay.js
@@ -8,6 +8,7 @@ var $btnObj = null; | @@ -8,6 +8,7 @@ var $btnObj = null; | ||
8 | var $btnLoad = null; | 8 | var $btnLoad = null; |
9 | var flag = 0; | 9 | var flag = 0; |
10 | var appWxID = getQueryString(window.location).appId; | 10 | var appWxID = getQueryString(window.location).appId; |
11 | + | ||
11 | // var appWxID = 'wx945eccc8163fd75b' | 12 | // var appWxID = 'wx945eccc8163fd75b' |
12 | var webAppCode = null;//如果是微信,先获取微信code | 13 | var webAppCode = null;//如果是微信,先获取微信code |
13 | //var $btnLoad = document.getElementById("loading"); | 14 | //var $btnLoad = document.getElementById("loading"); |
@@ -363,6 +364,7 @@ var webAppClass = { | @@ -363,6 +364,7 @@ var webAppClass = { | ||
363 | getCode: function () { | 364 | getCode: function () { |
364 | var appID = appWxID; | 365 | var appID = appWxID; |
365 | var code = getUrlParam('code'); | 366 | var code = getUrlParam('code'); |
367 | + | ||
366 | var local = window.location.href; | 368 | var local = window.location.href; |
367 | //alert("local:" + local); | 369 | //alert("local:" + local); |
368 | if (code == null || code === '') { | 370 | if (code == null || code === '') { |
@@ -470,6 +472,7 @@ var webAppClass = { | @@ -470,6 +472,7 @@ var webAppClass = { | ||
470 | var btnOBj = $btnObj; | 472 | var btnOBj = $btnObj; |
471 | //0:页面初始化获取code[webAppCode] | 473 | //0:页面初始化获取code[webAppCode] |
472 | var codeParams = { code: webAppCode, appId: appWxID }; | 474 | var codeParams = { code: webAppCode, appId: appWxID }; |
475 | + alert('微信webAppCode'+webAppCode) | ||
473 | var openIdUrl = webAppRoot + window.webAppH5.wxGetOpenIdServer; | 476 | var openIdUrl = webAppRoot + window.webAppH5.wxGetOpenIdServer; |
474 | 477 | ||
475 | //1:有code获取OpenId | 478 | //1:有code获取OpenId |
@@ -609,6 +612,9 @@ var webAppClass = { | @@ -609,6 +612,9 @@ var webAppClass = { | ||
609 | btnOBj.style.display = "block"; | 612 | btnOBj.style.display = "block"; |
610 | $btnLoad.style.display = "none"; | 613 | $btnLoad.style.display = "none"; |
611 | if (res.code == 0) {//进场 | 614 | if (res.code == 0) {//进场 |
615 | + alert(res.data) | ||
616 | + alert(JSON.stringify(res.data)) | ||
617 | + | ||
612 | document.write(res.data);//打开支付表单 | 618 | document.write(res.data);//打开支付表单 |
613 | } else {//其他情况如【该卡号场内已存在】 | 619 | } else {//其他情况如【该卡号场内已存在】 |
614 | console.log(res.message); | 620 | console.log(res.message); |
@@ -639,8 +645,8 @@ var webAppClass = { | @@ -639,8 +645,8 @@ var webAppClass = { | ||
639 | $paid = getObjectByID("paid"),//已支付金额 | 645 | $paid = getObjectByID("paid"),//已支付金额 |
640 | $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 | 646 | $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用 |
641 | $discountFee = getObjectByID("discountFee");//优惠金额 | 647 | $discountFee = getObjectByID("discountFee");//优惠金额 |
642 | - $businessFeeWrap = getObjectByID("businessFeeWrap") | ||
643 | - $businessFee = getObjectByID("businessFee") | 648 | + // $businessFeeWrap = getObjectByID("businessFeeWrap") |
649 | + // $businessFee = getObjectByID("businessFee") | ||
644 | 650 | ||
645 | if (params != null && params != "") { | 651 | if (params != null && params != "") { |
646 | var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); | 652 | var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100); |
@@ -655,13 +661,13 @@ var webAppClass = { | @@ -655,13 +661,13 @@ var webAppClass = { | ||
655 | $inparktime.innerHTML = params.inparktime; | 661 | $inparktime.innerHTML = params.inparktime; |
656 | $staytime.innerHTML = formatSeconds(params.staytime); | 662 | $staytime.innerHTML = formatSeconds(params.staytime); |
657 | // alert(params.parkName) | 663 | // alert(params.parkName) |
658 | - // alert(params.businessFee) | ||
659 | - if (params.businessUsedType == 0) { | ||
660 | - $('#businessFeeWrap').css('display', 'none') | ||
661 | - } else { | ||
662 | - var _mon = Number(params.businessFee) | ||
663 | - $businessFee.innerHTML = '¥' + (_mon / 100).toFixed(2); | ||
664 | - } | 664 | + // // alert(params.businessFee) |
665 | + // if (params.businessUsedType == 0) { | ||
666 | + // $('#businessFeeWrap').css('display', 'none') | ||
667 | + // } else { | ||
668 | + // var _mon = Number(params.businessFee) | ||
669 | + // $businessFee.innerHTML = '¥' + (_mon / 100).toFixed(2); | ||
670 | + // } | ||
665 | 671 | ||
666 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 | 672 | $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 |
667 | $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); | 673 | $paid.innerHTML = keepTwoDecimalFull(params.paid / 100); |
js/url.js
@@ -89,7 +89,7 @@ mUrl.getJx = function(){ | @@ -89,7 +89,7 @@ mUrl.getJx = function(){ | ||
89 | 89 | ||
90 | // var cepath = 'http://39.98.54.240:8090'; | 90 | // var cepath = 'http://39.98.54.240:8090'; |
91 | 91 | ||
92 | -var cepath = 'http://pay.service.huangshiparking.com'; | 92 | +var cepath = 'http://pay.service.renniting.cn/v1'; |
93 | // http://pay.service.renniting.cn | 93 | // http://pay.service.renniting.cn |
94 | // var cepath = 'http://39.98.54.240:8090' | 94 | // var cepath = 'http://39.98.54.240:8090' |
95 | // http://app.api.dyszt.com:8090 | 95 | // http://app.api.dyszt.com:8090 |
out.html
@@ -154,7 +154,7 @@ | @@ -154,7 +154,7 @@ | ||
154 | <input type="tel" id="inputPhoneNum" value="" onkeydown="inputDown();" placeholder="请输入手机号码" maxlength="14" onpaste="return false" style="display:block;" /> | 154 | <input type="tel" id="inputPhoneNum" value="" onkeydown="inputDown();" placeholder="请输入手机号码" maxlength="14" onpaste="return false" style="display:block;" /> |
155 | </div> | 155 | </div> |
156 | <div id="carNumBox" style="display:block;" class="flexBoxRow"> | 156 | <div id="carNumBox" style="display:block;" class="flexBoxRow"> |
157 | - <input class="input_province" type="text" readonly="readonly" maxlength="1" id="selProvince" onclick="provinceSelect();" value="鄂"> | 157 | + <input class="input_province" type="text" readonly="readonly" maxlength="1" id="selProvince" onclick="provinceSelect();" value="京"> |
158 | <span class="splitLine2"> |</span> | 158 | <span class="splitLine2"> |</span> |
159 | <input type="text" maxlength="10" name="inputCarNum" id="inputCarNum" /> | 159 | <input type="text" maxlength="10" name="inputCarNum" id="inputCarNum" /> |
160 | </div> | 160 | </div> |