update .gitignore

liuqimichale
1 parent b9997d75
Showing 6 changed files with 61 additions and 10 deletions
.gitignore
home.html
js/config.js
js/list.js
js/pay.js
list.html
@@ -11,4 +11,5 @@ $RECYCLE.BIN/
 .Trashes
  
 # Node.js
-node_modules/
 \ No newline at end of file
+node_modules/
+.idea
@@ -83,7 +83,7 @@
 <script src="js/config.js?v=0.1"></script>
 <script src="js/common.js?v=1.11"></script>
 <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>-->
-<script src="js/pay.js?v=0.11120"></script>
+<script src="js/pay.js?v=0.11320"></script>
 </body>
  
 </html>
@@ -15,7 +15,7 @@ var webAppPayResult = &quot;http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/
  
 /*公共参数*/
 webAppH5.comParams = {
-    app_id: 1,
+    app_id: 'wx945eccc8163fd75b',
     salt: 2,
     deviceInfo: 3,
     sign_type: 'md5',
@@ -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))
@@ -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 {
@@ -181,6 +181,6 @@
   }
 })();
 </script>
-<script src="js/list.js?a=2.01"></script>
+<script src="js/list.js?a=2.31"></script>
 </body>
 </html>