From 56ef5f906b553c2e6ff7a3fcaaa15287209d665b Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 29 Dec 2020 16:28:28 +0800
Subject: [PATCH] 黄石  30分钟内不需要缴费

---
 js/list.js   | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 listnew.html |  2 +-
 out.html     | 35 +----------------------------------
 3 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/js/list.js b/js/list.js
index b1e34ef..b8e91e1 100644
--- a/js/list.js
+++ b/js/list.js
@@ -75,37 +75,70 @@ jsajax.defaultReq(
     for (var i = 0; i < data.length; i++) {
       var orderFreeDuration = Number((data[i].orderFreeDuration))
       var parkDuration = Number((data[i].parkDuration))
+        // alert(data[i].unPayFee)
       var num = ((data[i].unPayFee) / 100).toFixed(2);
       var outflag = data[i].orderStateRemark;
 
       if (outflag == '出场缴费') {
         if (orderFreeDuration > parkDuration) {
-          htmls += '<div class="weui-cells" data-flag="0">' +
-            '        <div class="weui-cell">' +
-            '            <div class="weui-cell__bd">' +
-            '                <p class="carNumber">' + data[i].carNumber +  '</p>' +
-            '                <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' +
-            // '                <p class="orderId" style="display: none">' + data[i].orderId + '</p>' +
+          if(data[i].unPayFee=='0'){
+              htmls += '<div class="weui-cells" data-flag="0">' +
+                  '        <div class="weui-cell">' +
+                  '            <div class="weui-cell__bd">' +
+                  '                <p class="carNumber">' + data[i].carNumber +  '</p>' +
+                  '                <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' +
+                  // '                <p class="orderId" style="display: none">' + data[i].orderId + '</p>' +
+
+                  '            </div>' +
+                  '            <div class="weui-cell__ft paySrcType" style="color: #f00"></div>' +
+                  '        </div>' +
+                  '        <div class="weui-cell">' +
+                  '            <div class="weui-cell__bd">' +
+                  '                <p>车牌颜色:' +  filterColor(data[i].carNumberColor) + '</p>' +
+                  '                <p>停车场名称:' + data[i].parkName + '</p>' +
+                  '                <p>进场时间:' + data[i].parkInTime + '</p>' +
+                  '                <p>出场时间:' + data[i].parkOutTime + '</p>' +
+                  '                <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' +
+                  '            </div>' +
+                  '            <div class="weui-cell__ft ">' +
+                  '<p><span class="paymoney">' + num + '</span>元</p>' +
+                  // '<p  class="out-btn arrears-btn">离场缴费' +
+                  // '                <span class="orderId" style="display: none">' + data[i].orderId + '</span>' +
+                  // '</p>' +
+                  '</div>' +
+                  '        </div>' +
+                  '    </div>';
+          }else{
+              htmls += '<div class="weui-cells" data-flag="0">' +
+                  '        <div class="weui-cell">' +
+                  '            <div class="weui-cell__bd">' +
+                  '                <p class="carNumber">' + data[i].carNumber +  '</p>' +
+                  '                <p class="parkCode" style="display: none">' + data[i].parkCode + '</p>' +
+                  // '                <p class="orderId" style="display: none">' + data[i].orderId + '</p>' +
+
+                  '            </div>' +
+                  '            <div class="weui-cell__ft paySrcType" style="color: #f00"></div>' +
+                  '        </div>' +
+                  '        <div class="weui-cell">' +
+                  '            <div class="weui-cell__bd">' +
+                  '                <p>车牌颜色:' +  filterColor(data[i].carNumberColor) + '</p>' +
+                  '                <p>停车场名称:' + data[i].parkName + '</p>' +
+                  '                <p>进场时间:' + data[i].parkInTime + '</p>' +
+                  '                <p>出场时间:' + data[i].parkOutTime + '</p>' +
+                  '                <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' +
+                  '            </div>' +
+                  '            <div class="weui-cell__ft ">' +
+                  '<p><span class="paymoney">' + num + '</span>元</p>' +
+                  '<p  class="out-btn arrears-btn">离场缴费' +
+                  '                <span class="orderId" style="display: none">' + data[i].orderId + '</span>' +
+                  '</p>' +
+                  '</div>' +
+                  '        </div>' +
+                  '    </div>';
+          }
+
+
 
-            '            </div>' +
-            '            <div class="weui-cell__ft paySrcType" style="color: #f00"></div>' +
-            '        </div>' +
-            '        <div class="weui-cell">' +
-            '            <div class="weui-cell__bd">' +
-            '                <p>车牌颜色:' +  filterColor(data[i].carNumberColor) + '</p>' +
-            '                <p>停车场名称:' + data[i].parkName + '</p>' +
-            '                <p>进场时间:' + data[i].parkInTime + '</p>' +
-            '                <p>出场时间:' + data[i].parkOutTime + '</p>' +
-            '                <p>停车时长:' + dateFormat(data[i].parkDuration) + '</p>' +
-            '            </div>' +
-            '            <div class="weui-cell__ft ">' +
-            '<p><span class="paymoney">' + num + '</span>元</p>' +
-            '<p  class="out-btn arrears-btn">离场缴费' +
-            '                <span class="orderId" style="display: none">' + data[i].orderId + '</span>' +
-            '</p>' +
-            '</div>' +
-            '        </div>' +
-            '    </div>';
         } else {
           htmls += '<div class="weui-cells" data-flag="1">' +
             '        <div class="weui-cell">' +
diff --git a/listnew.html b/listnew.html
index dd51988..4472062 100644
--- a/listnew.html
+++ b/listnew.html
@@ -276,6 +276,6 @@
   }
 })();
 </script>
-<script src="js/list.js?A=11"></script>
+<script src="js/list.js?B=11"></script>
 </body>
 </html>
diff --git a/out.html b/out.html
index 3ee22b6..5f28c81 100644
--- a/out.html
+++ b/out.html
@@ -170,16 +170,7 @@
     <div id="outTipContent"></div>
 </section>
 <div id="id_keyboard_province"> </div>
-<!--
-  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">
 var queryParams = null;//?参数名称
 var $btnObj = null, $btnLoad = null;
@@ -256,9 +247,7 @@ function getRequest(url, params, init) {
           var tipStr = "无需缴费，欢迎下次光临";
           sucessTip(tipStr); alertMsg(tipStr);
         }
-        //var tel = document.getElementById("inputPhoneNum").value.replace(/\s/g, "");//去除空格
-        //var orderFee = keepTwoDecimalFull((tmpObj.orderFee / 100));//本次出场实际应付金额（减去折扣，优惠券等之后的应付金额）
-        //var tmpUrl = "orderId=" + tmpObj.orderId + "&outtime=" + tmpObj.outtime + "&tel=" + tel + "&orderFee=" + orderFee;
+
 
       } else {
         alertMsg("没有找到订单");
@@ -291,28 +280,6 @@ function sucessTip(content) {
 
 //获取查询条件值
 function getCarNumber() {
-  // var tmpValue = "";
-  // var tmpPhone = getObjectByID("inputPhoneNum");
-  // var state = tmpPhone.style.display == "block" ? true : false;
-  // if (state) {//默认手机号
-  //   tmpValue = tmpPhone.value.replace(/\s*/g, "")+'111';//去除空格
-  //   if (tmpValue == "" || tmpValue.length < 11) {
-  //     alertMsg("请输入正确的手机号码！");
-  //     tmpValue = "";
-  //   }
-  // } else {//车牌号
-  //   var tmpNum = getObjectByID("inputCarNum").value;
-  //   tmpValue = getObjectByID("selProvince").value + tmpNum;
-  //   if (tmpNum == "" || tmpNum == " ") {
-  //     alertMsg("车牌号不能为空！");
-  //     tmpValue = "";
-  //   }
-  //
-  //
-  //
-  // }
-  // console.log("查询值:" + tmpValue);
-  // return tmpValue;
 
 
 
--
libgit2 0.21.4