现在线上代码

liuqimichale
1 parent 328149f7
Showing 16 changed files with 125 additions and 29 deletions
MP_verify_RraH33H3qcFBr5f1.txt
home.html
img/default.png
img/no.png
img/ok.png
img/zero.png
js/ajax.js
js/config.js
js/list.js → js/listnew.js
js/pay.js
js/url.js
list.html
listnew.html
out.html
wxpayResult.html
zeroout.html
+RraH33H3qcFBr5f1
 \ No newline at end of file
@@ -33,6 +33,7 @@
     <div><span>停车时长:</span><span id="staytime"></span></div>
     <div><span>进场时间:</span><span id="inparktime"></span></div>
     <div><span>停车总费用:</span><span id="due"></span></div>
+	 <div id="businessFeeWrap"><span>商户优惠减免:</span><span id="businessFee"></span></div>
     <div><span>已支付金额:</span><span id="paid"></span></div>
     <div><span>优惠金额:</span><span id="discountFee"></span><span id="discountDesc"></span></div>
     <div><span>订单编号: </span><span id="orderNum">1234567890</span> </div>
@@ -82,10 +83,10 @@
  
  
 <script src="js/jquery-3.2.1.min.js"></script>
-<script src="js/config.js?v=0.1"></script>
-<script src="js/common.js?v=1.11"></script>
+<script src="js/config.js?j=4.1"></script>
+<script src="js/common.js?f=3.51"></script>
 <!--<script src="js/jweixin-1.0.0.js?v=0.1"></script>-->
-<script src="js/pay.js?v=1.5120"></script>
+<script src="js/pay.js?b=2.5120"></script>
 </body>
  
 </html>
-var jsajax = jsajax || {};
+var jsajax = jsajax || {};
 //任你停赤峰
 jsajax.appID = 'wx945eccc8163fd75b';
 //获取openid
-/*
+/*
 @songcxa
 @2018-12-14
 @移动支付配置[配置项除ip地址外勿动]
@@ -7,11 +7,11 @@ window.webAppH5 = {};
  
  
 /*服务器地址*/
-var webAppRoot = "http://pay.service.renniting.cn/v1";
+ var webAppRoot = "http://pay.service.huangshiparking.com";
 //test 测试环境
 // var webAppRoot = "http://39.98.54.240:8090";
 //微信支付结果回调地址
-var webAppPayResult = "http://wxgzh.renniting.cn/wechatwuxi/DEV/Threewf/codepay/page/wxpayResult.html";
+var webAppPayResult = "http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/wxpayResult.html";
  
 /*公共参数*/
 webAppH5.comParams = {
@@ -68,7 +68,7 @@ jsajax.defaultReq(
  
     var data = data.data.dataList;
     if(data.length==0){
-      $('#tip-title').text('暂无停车记录')
+      $('#tip-title').text('您的停车费用为0元，无须缴费，谢谢!')
       return
     }
     var htmls='';
@@ -381,6 +381,8 @@ function  getOneorder(carNumber,parkCode,orderId,_paySrcType){
           var unpaid = datas.unpaid;//待支付
           var paid = datas.paid;//实付
           var discountType = datas.discountType;
+		  var businessUsedType = datas.businessUsedType  //商户信息-是否使用商户券，1-使用，0-未使用
+		  var businessFee = datas.businessFee  //商户减扣金额
  
           if(datas.discountFee&&datas.discountFee!=''&&datas.discountFee!=undefined){
             discountFee = datas.discountFee;//已优惠
@@ -411,7 +413,8 @@ function  getOneorder(carNumber,parkCode,orderId,_paySrcType){
             +'&appId='+datas.appId
             +'&orderId='+datas.orderId
             +'&_paySrcType='+_paySrcType
-            +"&";
+            + "&businessUsedType=" + businessUsedType
+            + "&businessFee=" + businessFee
           console.log(src)
           window.location.assign(encodeURI(src))
         },100);
@@ -445,7 +448,7 @@ function getMd5sign()
  
 $('.outBtn').on('click',function () {
   //window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/Chifeng/Threewf/stoppayment/select.html'
-  window.location.href = 'http://wxgzh.renniting.cn/wechatwuxi/DEV/PDA-Payment/out.html'
+  window.location.href = 'http://wxgzh.huangshiparking.com/HSwechat/PDA-Payment/out.html'
  
 })
 $('.hiddenBtn').on('click',function () {
-/*
+/*
 @songcxa
 @2018-12-14
 @移动支付
@@ -647,6 +647,8 @@ var webAppClass = {
             $paid = getObjectByID("paid"),//已支付金额
             $discountDesc = getObjectByID("discountDesc"),//8折优惠折扣费用
             $discountFee = getObjectByID("discountFee");//优惠金额
+			$businessFeeWrap = getObjectByID("businessFeeWrap")
+			    $businessFee = getObjectByID("businessFee")
  
         if (params != null && params != "") {
             var price = keepTwoDecimalFull((params.orderFee / 100));//(params.orderFee / 100);
@@ -660,6 +662,14 @@ var webAppClass = {
             $parkName.innerHTML = params.parkName;
             $inparktime.innerHTML = params.inparktime;
             $staytime.innerHTML = formatSeconds(params.staytime);
+			// alert(params.parkName)
+			// alert(params.businessFee)
+			 if (params.businessUsedType == 0) {
+			        $('#businessFeeWrap').css('display', 'none')
+			      } else {
+					  var _mon = Number(params.businessFee)
+			        $businessFee.innerHTML = '￥' + ( _mon / 100).toFixed(2);
+			      }
  
             $due.innerHTML = keepTwoDecimalFull((params.due / 100));//停车总费用
             $paid.innerHTML = keepTwoDecimalFull(params.paid / 100);
-var mUrl = mUrl || {};
+var mUrl = mUrl || {};
  
  
 //songcxa 15801541129
@@ -89,7 +89,7 @@ mUrl.getJx = function(){
  
 // var cepath = 'http://39.98.54.240:8090';
  
-var cepath = 'http://pay.service.renniting.cn/v1';
+var cepath = 'http://pay.service.huangshiparking.com';
 // http://pay.service.renniting.cn
 // var cepath = 'http://39.98.54.240:8090'
 // http://app.api.dyszt.com:8090
@@ -183,7 +183,7 @@
     </style>
 </head>
 <body ontouchstart="">
-<div id="tip-title" class="weui-cells__title" style="color: #f00;text-align: center">48小时限时补缴优惠</div>
+<!--<div id="tip-title" class="weui-cells__title" style="color: #f00;text-align: center">48小时限时补缴优惠</div>-->
 <div id="pay_listcont">
  
 </div>
@@ -224,7 +224,7 @@
  
 <script src="js/md5.min.js"></script>
  
-<script src="js/url.js?a=1.11"></script>
+<script src="js/url.js?u=1.11"></script>
 <script src="js/ajax.js"></script>
 <script type="text/javascript">
 //微信浏览器中，aler弹框不显示域名
@@ -244,6 +244,6 @@
   }
 })();
 </script>
-<script src="js/list.js?b=11141.31"></script>
+<script src="js/list.js?h=11141.31"></script>
 </body>
 </html>
@@ -183,7 +183,7 @@
     </style>
 </head>
 <body ontouchstart="">
-<div id="tip-title" class="weui-cells__title" style="color: #f00;text-align: center">48小时限时补缴优惠</div>
+<div id="tip-title" class="weui-cells__title" style="color: #f00;text-align: center"></div>
 <div id="pay_listcont">
  
 </div>
@@ -224,8 +224,8 @@
  
 <script src="js/md5.min.js"></script>
  
-<script src="js/url.js?a=1.11"></script>
-<script src="js/ajax.js"></script>
+<script src="js/url.js?a=4.11"></script>
+<script src="js/ajax.js?a=44"></script>
 <script type="text/javascript">
 //微信浏览器中，aler弹框不显示域名
 (function(){
@@ -244,6 +244,6 @@
   }
 })();
 </script>
-<script src="js/list.js?b=11141.31"></script>
+<script src="js/listnew.js"></script>
 </body>
 </html>
@@ -15,8 +15,8 @@
     <meta http-equiv="Expires" content="0">
     <link rel="stylesheet" href="css/reset.css?v=0.1">
     <link rel="stylesheet" href="css/provinceKey.css?v=0.1">
-    <script src="js/config.js"></script>
-    <script src="js/common.js?v=0.01"></script>
+    <script src="js/config.js?b=111"></script>
+    <script src="js/common.js?i=1.01"></script>
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -26,6 +26,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+
     <title>扫码查询出场</title>
     <style>
         body {
@@ -153,7 +154,7 @@
             <input type="tel" id="inputPhoneNum" value="" onkeydown="inputDown();" placeholder="请输入手机号码" maxlength="14" onpaste="return false" style="display:block;" />
         </div>
         <div id="carNumBox" style="display:block;" class="flexBoxRow">
-            <input class="input_province" type="text" readonly="readonly" maxlength="1" id="selProvince" onclick="provinceSelect();" value="蒙">
+            <input class="input_province" type="text" readonly="readonly" maxlength="1" id="selProvince" onclick="provinceSelect();" value="鄂">
             <span class="splitLine2"> |</span>
             <input type="text" maxlength="10" name="inputCarNum" id="inputCarNum" />
         </div>
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <meta name="google" value="notranslate">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="format-detection" content="email=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-control" content="no-cache">
+    <meta http-equiv="Cache" content="no-cache">
+    <meta http-equiv="Expires" content="0">
+    <script src="js/common.js"></script>
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>支付状态</title>
+</head>
+<body style="background-color: #f0f4f5;">
+<!--<noscript>-->
+<!--You need to enable JavaScript to run this app.-->
+<!--</noscript>-->
+<header id="header" style="margin-top:25%; display: flex; justify-content: center; align-items: center; flex-direction: column; ">
+    <img id="stateImg" src="img/default.png" style="width: 64px; height: 64px; " />
+    <div id="stateLable" style="font-size: 18px; color: #777; margin-top: 20px;">状态</div>
+</header>
+
+<!--
+  This HTML file is a template.
+  If you open it directly in the browser, you will see an empty page.
+
+  You can add webfonts, meta tags, or analytics to this file.
+  The build step will place the bundled scripts into the <body> tag.
+
+  To begin the development, run `npm start` or `yarn start`.
+  To create a production bundle, use `npm run build` or `yarn build`.
+-->
+<script type="text/javascript">
+window.onload = function () {
+  var tmpParams = getQueryString(window.location);
+  if (tmpParams != null) {
+    console.log(JSON.stringify(tmpParams));
+    if (tmpParams.trade_no == "success") {
+      getResponse("success");
+    } else {
+      getResponse("fail");
+    }
+    //alertMsg("支付返回参数:" + JSON.stringify(tmpParams));
+  } else {
+    console.log("支付返回参数" + tmpParams);
+  }
+}
+//type[fail、sucesss]
+function getResponse(type) {
+  var img = document.getElementById("stateImg");
+  var label = document.getElementById("stateLable");
+  if (type == "fail") {
+    img.src = "img/no.png";
+    label.innerHTML = "支付失败，尝试重新扫码";
+  } else {
+    img.src = "img/ok.png";
+    label.innerHTML = "订单支付成功";
+  }
+}
+</script>
+</body>
+
+
+</html>
@@ -67,8 +67,10 @@
         <div class="float-left">温馨提示: </div>
         <div class="float-right">
             <p>请尽快离场,超过15分钟将重新计费哦!</p>
-            <p>索要发票请联系停车管理员或拨打</p>
-            <p>客服电话: 400-63456881</p>
+            <p>需要发票可下载APP‘黄石停车’开具电子发票
+
+            </p>
+            <p>客服电话：0714-6212345</p>
         </div>
     </div>
  
@@ -105,12 +107,12 @@
   }
 })();
  
-setTimeout(function () {
-  window.location.href="list.html?carNumber="+getQueryString(window.location).carNumber
-},3000)
+// setTimeout(function () {
+//   window.location.href="list.html?carNumber="+getQueryString(window.location).carNumber
+// },3000)
  
 $('#ok-btn').on('click',function () {
-  window.location.href="list.html?carNumber="+getQueryString(window.location).carNumber
+  window.location.href="listnew.html?carNumber="+getQueryString(window.location).carNumber
 })
  
 function getQueryString(location) {