diff --git a/home.html b/home.html index a56ecc5..acb52e6 100644 --- a/home.html +++ b/home.html @@ -83,10 +83,13 @@ - - + + + + + - + diff --git a/js/config.js b/js/config.js index d30a70e..2c66a4a 100644 --- a/js/config.js +++ b/js/config.js @@ -53,6 +53,9 @@ webAppH5.zeroPayServer = "/appAccountPay/zeroPay"; // 新接口银联 webAppH5.doPay = "/unionpay/doPay"; + +webAppH5.doOrderCreate = '/unionpay/doOrderCreate'; + /*入场参数*/ //测试地址 //http://localhost:18879/page/in.html?plNo=P11011700C&parkingId=1&channelId=172198242&direction=0&codeType=0&expireDate=expireDate&extendData=extendData diff --git a/js/pay.js b/js/pay.js index ab0e6e8..ebb4419 100644 --- a/js/pay.js +++ b/js/pay.js @@ -238,19 +238,9 @@ var webAppClass = { console.log(res) if (res.code == 0) { document.getElementById("paySuccess").style.display = 'block' - // - // document.getElementById("sumMoney").innerHTML = (res.data.orderFee/100) - // document.getElementById("discountTip").innerHTML = res.data.couponDescribe - // document.getElementById("discountFee").innerHTML = (res.data.discountFee/100) - // document.getElementById("discountDesc").style.display="none" - // $btnLoad.style.display = "none"; - // $btnObj.style.display = "block"; - // document.getElementById("discountBox").setAttribute('readonly','readonly'); - // flag = 1 + } else { alert(res.message) - // $discountBtn.disabled = false - // document.getElementById("discountTip").innerHTML = res.message } }) } else { @@ -260,36 +250,7 @@ var webAppClass = { //alert(clientType); switch (clientType) { case "wxPay"://微信[内置浏览器] - //var wxPay = webAppH5.wxPayServer; - //var wxParams = webAppH5.comParams; - //wxParams.orderId = orderID; - //wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - //wxParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - //debugger; - - // //新增start - // - // var url = " https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx20161110163838f231619da20804912345&package=1037687096"; - // //window.location.href = url; - // var wxPay = webAppH5.wxPayServer; - // var wxParams = webAppH5.comParams; - // wxParams.carNumber = getQueryString(window.location).carnum; - // wxParams.orderId = orderID; - // wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - // wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - // - // wxParams.paySrcType = getQueryString(window.location)._paySrcType;//101停车支付 - // - // wxParams.recordArreaInfos= JSON.stringify([{"orderId":webAppParams.orderId,"orderNotPayFee":_mon*100,"parkId":getQueryString(window.location).parkCode}]); - // - // //新增end - - // if (webAppCode == null || webAppCode == "") {//code检测 - // alertMsg(appState.codeNullTip); - // $btnObj.style.display = "block"; - // $btnLoad.style.display = "none"; - // return; - // } + webAppClass.payAjaxJDK(orderID); console.log("wxPay");//微信支付 break; @@ -298,25 +259,15 @@ var webAppClass = { //订单号 var obj = {}; //this.payAjax(url, { orderId: "11111", price: 0.01 }); - var aliPay = webAppH5.doPay; - // var aliParams = webAppH5.comParams; - // aliParams.orderId = orderID; - // aliParams.carNumber = getQueryString(window.location).carnum; - // aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - // aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - // aliParams.paySrcType = getQueryString(window.location)._paySrcType;//101停车支付 - // - // aliParams.recordArreaInfos = JSON.stringify([{ - // "orderId": webAppParams.orderId, - // "orderNotPayFee": _mon * 100, - // "parkId": getQueryString(window.location).parkCode - // }]); - // - - - // webAppClass.payAliAjax(root + aliPay, aliParams); - - webAppClass.payAliAjax(doPayroot + aliPay,utilParams(1,orderID,'')); + var aliPay = webAppH5.doPay; + + if(_paySrcType == 103){ + doOrderCreate(orderID,aliPay) + }else{ + webAppClass.payAliAjax(doPayroot + aliPay,utilParams(1,orderID,'')); + } + + break; default://第三方浏览器other //默认支付宝 @@ -326,41 +277,28 @@ var webAppClass = { var obj = {}; //this.payAjax(url, { orderId: "11111", price: 0.01 }); var aliPay = webAppH5.doPay; - // var aliParams = webAppH5.comParams; - // aliParams.orderId = orderID; - // aliParams.carNumber = getQueryString(window.location).carnum; - // aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - // aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - // aliParams.paySrcType = getQueryString(window.location)._paySrcType;//101停车支付 - // - // aliParams.recordArreaInfos = JSON.stringify([{ - // "orderId": webAppParams.orderId, - // "orderNotPayFee": _mon * 100, - // "parkId": getQueryString(window.location).parkCode - // }]); - - // webAppClass.payAliAjax(root + aliPay, aliParams); - webAppClass.payAliAjax(doPayroot + aliPay, utilParams(1,orderID,'')); + + if(_paySrcType == 103){ + doOrderCreate(orderID,aliPay) + }else{ + webAppClass.payAliAjax(doPayroot + aliPay,utilParams(1,orderID,'')); + } + + + // webAppClass.payAliAjax(doPayroot + aliPay, utilParams(1,orderID,'')); } else {//微信页面支付 var url = " https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx20161110163838f231619da20804912345&package=1037687096"; //window.location.href = url; var wxPay = webAppH5.doPay; - // var wxParams = webAppH5.comParams; - // wxParams.carNumber = getQueryString(window.location).carnum; - // wxParams.orderId = orderID; - // wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - // wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - // - // wxParams.paySrcType = getQueryString(window.location)._paySrcType;//101停车支付 - // - // wxParams.recordArreaInfos = JSON.stringify([{ - // "orderId": webAppParams.orderId, - // "orderNotPayFee": _mon * 100, - // "parkId": getQueryString(window.location).parkCode - // }]); - // webAppClass.payAjax(root + wxPay, wxParams); - webAppClass.payAliAjax(doPayroot + wxPay,utilParams(1,orderID,'')); + + if(_paySrcType == 103){ + doOrderCreate(orderID,aliPay) + }else{ + webAppClass.payAliAjax(doPayroot + wxPay,utilParams(2,orderID,'')); + } + + // webAppClass.payAliAjax(doPayroot + wxPay,utilParams(1,orderID,'')); console.log("wxPay"); } break; @@ -488,7 +426,49 @@ var webAppClass = { //alert(JSON.stringify(res)); if (res.code == 0) { //alert(res.data); - webAppClass.getPayParams(res.data, orderID); + + + + var _paySrcType = getQueryString(window.location)._paySrcType + + if(_paySrcType == 103){ + // doOrderCreate(orderID,aliPay) + + + // var paySrcType = getQueryString(window.location)._paySrcType + // var salt = jsajax.salt(6); + var jsondata = { + orderBigType: 100, + payOrderType:_paySrcType, + parkOrderIds:[orderID], + terminalSource: 7, + operName:'', + operCode:'', + }; + jsondata = JSON.stringify(jsondata); + jsajax.defaultReq( + webAppRoot+webAppH5.doOrderCreate, + jsondata, + function (data) { + console.log('调用微信支付 ' + JSON.stringify(data)); + if (data.code == 0) { + var orderID = data.data.rltOrderId + // webAppClass.payAliAjax(doPayroot + aliPay,utilParams(1,orderID,'')); + webAppClass.getPayParams(res.data, orderID); + } else { + alert('失败') + } + } + ); + + + + }else{ + + webAppClass.getPayParams(res.data, orderID); + } + + } else if (res.code == 40163) {//code been used, hints[重复code问题] alertMsg(appState.codeNullTip); @@ -511,32 +491,9 @@ var webAppClass = { //} }, getPayParams: function (openId, orderID) { - // var wxPay = window.webAppH5.wxPayServer; - // var wxParams = window.webAppH5.comParams; - // var _mon = document.getElementById("sumMoney").innerHTML - // wxParams.orderId = orderID; - // wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - // wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 - // //webAppClass.payAjax(root + wxPay, wxParams); - // - // //新增start - // - // wxParams.carNumber = getQueryString(window.location).carnum; - // - // wxParams.paySrcType = getQueryString(window.location)._paySrcType;//101停车支付 - // - // wxParams.recordArreaInfos = JSON.stringify([{ - // "orderId": webAppParams.orderId, - // "orderNotPayFee": _mon * 100, - // "parkId": getQueryString(window.location).parkCode - // }]); - - //新增end - - // wxParams.openId = openId; - // wxParams.appId = appWxID; - - // var jsondata = JSON.stringify(utilParams(2,orderID,openId)); + + + var jsondata = utilParams(2,orderID,openId); var payParamsUrl = webAppRoot + window.webAppH5.doPay; @@ -753,4 +710,31 @@ function utilParams(val,orderID,openId) { return jsondata } +function doOrderCreate(orderID,aliPay){ + var paySrcType = getQueryString(window.location)._paySrcType + // var salt = jsajax.salt(6); + var jsondata = { + orderBigType: 100, + payOrderType:paySrcType, + parkOrderIds:[orderID], + terminalSource: 7, + operName:'', + operCode:'', + }; + jsondata = JSON.stringify(jsondata); + jsajax.defaultReq( + doPayroot+webAppH5.doOrderCreate, + jsondata, + function (data) { + console.log('调用微信支付 ' + JSON.stringify(data)); + if (data.code == 0) { + orderID = data.data.rltOrderId + webAppClass.payAliAjax(doPayroot + aliPay,utilParams(1,orderID,'')); + } else { + alert('失败') + } + } + ); +} +