From 91d337d4c1b90b5db5cf4342cc02d32e1c13c8d4 Mon Sep 17 00:00:00 2001
From: songchongxian <546803970@qq.com>
Date: Fri, 22 Feb 2019 14:08:15 +0800
Subject: [PATCH] 同步服务器版本

---
 doc.txt          | 14 ++------------
 dynCodePay.html  |  4 ++--
 index.html       |  2 +-
 js/dynCodePay.js |  2 +-
 pay.html         |  4 ++--
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/doc.txt b/doc.txt
index 1968c65..8cb4439 100644
--- a/doc.txt
+++ b/doc.txt
@@ -52,15 +52,5 @@ http://39.98.54.240/codepay/index.html?plNo=P11011700C&parkingId=1&channelId=172
 http://39.98.54.240/codepay/index.html?plNo=P11011700C&parkingId=1&channelId=172198243&direction=1&codeType=0&expireDate=expireDate&extendData=extendData
 
 
-//serverͨ��--12
-//����--֧��У��
-http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/page/out6.html?plNo=B1504020C7&parkingId=1&channelId=172198243&direction=1&codeType=0&expireDate=expireDate&extendData=extendData
-
-//��̬��-Ǯ��url�У�û��У��
-http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/dynCodePay6.html?codeType=2&isNeedPay=1&orderId=101527546939039301632&parkName=%E4%B8%87%E8%BE%BE%E5%81%9C%E8%BD%A6%E5%9C%BA&parkCode=a001&inparktime=2018-12-26%2000%3A00%3A00&outtime=2018-12-26%2010%3A00%3A00&staytime=360&orderFee=100&plateno=%E8%92%99DY2408
-
-
-//������
-http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/pay.html?orderId=101536977652977254400&parkName=%E9%9D%99%E9%9B%85%E5%B0%81%E9%97%AD%E8%BD%A6%E5%9C%BA&parkCode=B1504020C7&inparktime=2019-01-21%2018%3A37%3A26&outtime=2019-01-22%2012%3A01%3A48&staytime=62640&due=1100&paid=0&orderTotalFee=1100&orderFee=990&discountFee=110&plateno=%E8%92%99DJF612&outPayOrderNo=B1504020C720190122120148594DJF612-172198243&appOrderTimeout=%E8%AF%B7%E5%9C%A8%E6%94%AF%E4%BB%98%E5%AE%8C%E6%88%9010%E5%88%86%E9%92%9F%E5%86%85%E5%87%BA%E5%9C%BA%EF%BC%8C%E5%A6%82%E8%B6%85%E6%97%B6%E6%9C%AA%E5%87%BA%E5%9C%BA%EF%BC%8C%E4%BC%9A%E7%BB%A7%E7%BB%AD%E8%AE%A1%E8%B4%B9%E3%80%82&discountDesc=9%E6%8A%98%E4%BC%98%E6%83%A0&queryOrderInfo=%7B%22app_id%22%3A%221%22%2C%22carNumber%22%3A%22%E8%92%99DJF612%22%2C%22channelId%22%3A%22172198243%22%2C%22codeType%22%3A0%2C%22deviceInfo%22%3A%223%22%2C%22direction%22%3A1%2C%22expireDate%22%3A%22expireDate%22%2C%22extendData%22%3A%22extendData%22%2C%22parkingId%22%3A%223504%22%2C%22plNo%22%3A%22B1504020C7%22%2C%22salt%22%3A%222%22%2C%22sign%22%3A%224%22%2C%22sign_type%22%3A%22md5%22%2C%22terminalSource%22%3A%227%22%2C%22token%22%3A%22666%22%7D&needPay=true
-//��̬��
-http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/dynCodePay.html?codeType=2&isNeedPay=1&orderId=101536977652977254400&parkName=%E4%B8%87%E8%BE%BE%E5%81%9C%E8%BD%A6%E5%9C%BA&parkCode=a001&inparktime=2018-12-26%2000%3A00%3A00&outtime=2018-12-26%2010%3A00%3A00&staytime=360&orderFee=100&plateno=%E8%92%99D3C187
\ No newline at end of file
+//����
+http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/pay2.html?orderId=101548443992350658560&parkName=%E9%9D%99%E9%9B%85%E5%B0%81%E9%97%AD%E8%BD%A6%E5%9C%BA&parkCode=B1504020C7&inparktime=2019-02-22%2010%3A00%3A34&outtime=2019-02-22%2010%3A41%3A02&staytime=2400&due=300&paid=0&orderTotalFee=300&orderFee=300&discountFee=0&plateno=%E8%92%99DLL891&outPayOrderNo=B1504020C720190222104102273DLL891-172198243&appOrderTimeout=%E8%AF%B7%E5%9C%A8%E6%94%AF%E4%BB%98%E5%AE%8C%E6%88%9010%E5%88%86%E9%92%9F%E5%86%85%E5%87%BA%E5%9C%BA%EF%BC%8C%E5%A6%82%E8%B6%85%E6%97%B6%E6%9C%AA%E5%87%BA%E5%9C%BA%EF%BC%8C%E4%BC%9A%E7%BB%A7%E7%BB%AD%E8%AE%A1%E8%B4%B9%E3%80%82&discountDesc=%E6%97%A0%E4%BC%98%E6%83%A0&queryOrderInfo=%7B%22app_id%22%3A%221%22%2C%22carNumber%22%3A%22%E8%92%99DLL891%22%2C%22channelId%22%3A%22172198243%22%2C%22codeType%22%3A0%2C%22deviceInfo%22%3A%223%22%2C%22direction%22%3A1%2C%22expireDate%22%3A%22expireDate%22%2C%22extendData%22%3A%22extendData%22%2C%22parkingId%22%3A%223504%22%2C%22plNo%22%3A%22B1504020C7%22%2C%22salt%22%3A%222%22%2C%22sign%22%3A%224%22%2C%22sign_type%22%3A%22md5%22%2C%22terminalSource%22%3A%227%22%2C%22token%22%3A%22666%22%7D&needPay=true
\ No newline at end of file
diff --git a/dynCodePay.html b/dynCodePay.html
index af8a374..743633c 100644
--- a/dynCodePay.html
+++ b/dynCodePay.html
@@ -15,8 +15,8 @@
     <meta http-equiv="Expires" content="0">
     <link rel="stylesheet" href="css/index.css?v=0.1">
     <script src="config.js?v=0.1"></script>
-    <script src="js/common.js?v=0.12"></script>
-    <script src="js/dynCodePay.js?v=0.12"></script>
+    <script src="js/common.js?v=0.11"></script>
+    <script src="js/dynCodePay.js?v=0.11"></script>
  <!--<script src="config.js"></script>-->
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
diff --git a/index.html b/index.html
index c5519a8..baaa163 100644
--- a/index.html
+++ b/index.html
@@ -66,7 +66,7 @@
         }
         //type[fail、sucesss]
         function getResponse(params) {
-            //debugger;
+            debugger;
             var direction = params.direction;//direction=0 [通行方向 入：0，1:出 必填]
             var queryParams = parseParams(params);
             //小票二维码特殊处理[不带codeType]
diff --git a/js/dynCodePay.js b/js/dynCodePay.js
index 1c44d92..9d29b03 100644
--- a/js/dynCodePay.js
+++ b/js/dynCodePay.js
@@ -88,7 +88,7 @@ var webAppClass = {
         //alert("local:" + local);
         if (code == null || code === '') {
             //alert(code);
-            window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + appID + '&redirect_uri=' + encodeURIComponent(local) + '&response_type=code&scope=snsapi_userinfo&state=1#wechat_redirect'
+            window.location.href = 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' + appID + '&redirect_uri=' + encodeURIComponent(local) + '&response_type=code&scope=snsapi_base&state=1#wechat_redirect'
         } else {
             return code;
         }
diff --git a/pay.html b/pay.html
index bf1e17d..b262279 100644
--- a/pay.html
+++ b/pay.html
@@ -15,9 +15,9 @@
     <meta http-equiv="Expires" content="0">
     <link rel="stylesheet" href="css/index.css?v=0.1">
     <script src="config.js?v=0.1"></script>
-    <script src="js/common.js?v=0.12"></script>
+    <script src="js/common.js?v=0.11"></script>
     <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>-->
-    <script src="js/pay.js?v=0.12"></script>
+    <script src="js/pay.js?v=0.120"></script>
     <!--<script src="https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js"></script>-->
     <!--<script src="config.js"></script>-->
     <!--
--
libgit2 0.21.4