From dc07d4e3613167412e565637203666a1fb9464fd Mon Sep 17 00:00:00 2001 From: liuqimichale <123456lq> Date: Thu, 14 Nov 2019 10:57:29 +0800 Subject: [PATCH] update .gitignore --- .gitignore | 3 ++- home.html | 2 +- js/config.js | 2 +- js/list.js | 3 +-- js/pay.js | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- list.html | 2 +- 6 files changed, 61 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c16e483..88afd44 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ $RECYCLE.BIN/ .Trashes # Node.js -node_modules/ \ No newline at end of file +node_modules/ +.idea diff --git a/home.html b/home.html index e406efc..7fc9d58 100644 --- a/home.html +++ b/home.html @@ -83,7 +83,7 @@ - + diff --git a/js/config.js b/js/config.js index 63bea76..9ac0faa 100644 --- a/js/config.js +++ b/js/config.js @@ -15,7 +15,7 @@ var webAppPayResult = "http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/ /*公共参数*/ webAppH5.comParams = { - app_id: 1, + app_id: 'wx945eccc8163fd75b', salt: 2, deviceInfo: 3, sign_type: 'md5', diff --git a/js/list.js b/js/list.js index 2fd5767..acd07d7 100644 --- a/js/list.js +++ b/js/list.js @@ -337,8 +337,6 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ } else { _payType = 1 } - - var jsondata = { app_id: "0eca8f5373ca4866aec2f8e9d9367104", deviceInfo : "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E", @@ -408,6 +406,7 @@ function getOneorder(carNumber,parkCode,orderId,_paySrcType){ +'&appOrderTimeout='+datas.appOrderTimeout +'&appId='+datas.appId +'&orderId='+datas.orderId + +'&_paySrcType='+_paySrcType +"&"; console.log(src) window.location.assign(encodeURI(src)) diff --git a/js/pay.js b/js/pay.js index 576a300..2a1309a 100644 --- a/js/pay.js +++ b/js/pay.js @@ -209,9 +209,12 @@ var webAppClass = { var val = document.getElementById("sumMoney").innerText; //var couponPersonId = document.getElementById("discountBox").value; var url = webAppRoot + window.webAppH5.zeroPayServer; + var _paySrcType = getQueryString(window.location)._paySrcType + var _mon = document.getElementById("sumMoney").innerText var discountParams = { - payOrderType : 101, + payOrderType : _paySrcType, + recordArreaInfos:JSON.stringify([{"orderId":webAppParams.orderId,"orderNotPayFee":_mon*100,"parkId":getQueryString(window.location).parkCode}]), terminalSource:7, orderId: webAppParams.orderId, //couponPersonId:couponPersonId, @@ -254,6 +257,28 @@ var webAppClass = { //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"; @@ -271,9 +296,12 @@ var webAppClass = { var aliPay = webAppH5.aliPayServer; 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 = 101;//101停车支付 + 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); break; default://第三方浏览器other @@ -286,18 +314,27 @@ var webAppClass = { var aliPay = webAppH5.aliPayServer; 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 = 101;//101停车支付 + 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); } else {//微信页面支付 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}]); webAppClass.payAjax(root + wxPay, wxParams); console.log("wxPay"); } @@ -454,6 +491,20 @@ var webAppClass = { 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 payParamsUrl = webAppRoot + window.webAppH5.wxPayServer; @@ -577,7 +628,7 @@ var webAppClass = { $staytime.innerHTML = formatSeconds(params.staytime); $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用 - $paid.innerHTML = params.paid; + $paid.innerHTML = keepTwoDecimalFull(params.paid/100); $discountFee.innerHTML = params.discountFee;//优惠金额 // $discountDesc.innerHTML = params.discountDesc; } else { diff --git a/list.html b/list.html index 5efa55a..0913715 100644 --- a/list.html +++ b/list.html @@ -181,6 +181,6 @@ } })(); - + -- libgit2 0.21.4