Merge branch 'rprofit' of 39.97.239.116:gyfl/xyzshop into rprofit

admin/templates/default/analysis.new_version.mch_order_send.php

@@ -66,12 +66,12 @@
     <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
         <table class="tb-type1 noborder search tableFixed">
             <tr>
-                <!-- <th><label for="query_start_time">统计时间</label></th>
+                <th><label for="query_start_time">统计时间</label></th>
                 <td>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>" id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
                     <label for="query_start_time">~</label>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>" id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
-                </td> -->
+                </td>
                 <!-- <th><label>机构选择</label></th>
                 <td>
                     <div id="select_merchants"></div>
@@ -231,13 +231,15 @@
 
 
         $('#ncsubmit').click(function() {
-            // let query_start_time = $("input[name=query_start_time]").val()
-            // let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
-            // let query_end_time = $("input[name=query_end_time]").val()
-            // let end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
+            let query_start_time = $("input[name=query_start_time]").val()
+            let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
+            let query_end_time = $("input[name=query_end_time]").val()
+            let end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
 
-            let start_time = Date.parse(new Date()) / 1000 - 7200;
-            let end_time = Date.parse(new Date()) / 1000;
+            if (!start_time && !end_time) {
+                start_time = Date.parse(new Date()) / 1000 - 7200;
+                end_time = Date.parse(new Date()) / 1000;
+            }
 
             // let mchids = select_set(select_merchants.getValue())
 

admin/templates/default/analysis.new_version.provider.php

@@ -67,12 +67,12 @@
     <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
         <table class="tb-type1 noborder search tableFixed">
             <tr>
-                <!-- <th><label for="query_start_time">统计时间</label></th>
+                <th><label for="query_start_time">统计时间</label></th>
                 <td>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>" id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
                     <label for="query_start_time">~</label>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>" id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
-                </td> -->
+                </td>
                 <th><label>通道质量</label></th>
                 <td>
                     <select name="quality" class="querySelect">
@@ -293,13 +293,15 @@
         }
 
         $('#ncsubmit').click(function() {
-            // let query_start_time = $("input[name=query_start_time]").val()
-            // let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
-            // let query_end_time = $("input[name=query_end_time]").val()
-            // let end_time =   parseInt((new Date(query_end_time)).getTime() / 1000);
-
-            let start_time = Date.parse(new Date()) / 1000 - 7200;
-            let end_time = Date.parse(new Date()) / 1000;
+            let query_start_time = $("input[name=query_start_time]").val()
+            let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
+            let query_end_time = $("input[name=query_end_time]").val()
+            let end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
+
+            if (!start_time && !end_time) {
+                start_time = Date.parse(new Date()) / 1000 - 7200;
+                end_time = Date.parse(new Date()) / 1000;
+            }
 
             let chnamesList = [];
             $('input[name="channelValue"]').each(function() {

admin/templates/default/analysis.new_version.system.php

@@ -65,12 +65,12 @@
     <form method="get" action="index.php" name="formSearch" id="formSearch" style="min-width: 1200px;">
         <table class="tb-type1 noborder search tableFixed">
             <tr>
-                <!-- <th><label for="query_start_time">统计时间</label></th>
+                <th><label for="query_start_time">统计时间</label></th>
                 <td>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_start_time']; ?>" id="startTime" name="query_start_time" autocomplete="off" style="width:120px" />
                     <label for="query_start_time">~</label>
                     <input class="txt date" type="text" value="<?php echo $_GET['query_end_time']; ?>" id="endTime" name="query_end_time" autocomplete="off" style="width:120px" />
-                </td> -->
+                </td>
                 <!-- <th><label>机构选择</label></th>
                 <td>
                     <div id="select_merchants"></div>
@@ -283,13 +283,16 @@
         })
 
         $('#ncsubmit').click(function() {
-            // let query_start_time = $("input[name=query_start_time]").val()
-            // let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
-            // let query_end_time = $("input[name=query_end_time]").val()
-            // let end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
+            let query_start_time = $("input[name=query_start_time]").val()
+            let start_time = parseInt((new Date(query_start_time)).getTime() / 1000);
+            let query_end_time = $("input[name=query_end_time]").val()
+            let end_time = parseInt((new Date(query_end_time)).getTime() / 1000);
+
+            if (!start_time && !end_time) {
+                start_time = Date.parse(new Date()) / 1000 - 7200;
+                end_time = Date.parse(new Date()) / 1000;
+            }
 
-            let start_time = Date.parse(new Date()) / 1000 - 7200;
-            let end_time = Date.parse(new Date()) / 1000;
 
             // let mchids = select_set(select_merchants.getValue())
             let mchidList = [];