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

admin/control/ordersendlist.php

@@ -225,6 +225,8 @@ class ordersendlistControl extends SystemControl
         $period = 180;
         if(!empty($_GET['time'])) {
             $period = intval($_GET['time']);
+        }else{
+            $_GET['time'] = $period;
         }
         $time_cond = $this->notify_time($cur_time,$period);
 
@@ -570,7 +572,7 @@ class ordersendlistControl extends SystemControl
         $notify_time = $_GET['notify_time'];
         if($notify_time > 0) {
             $start_day = strtotime("-5 days",$cur_time);
-            $condition['refill_order.notify_time'] = ['lt', (time() - $notify_time)];
+            $condition['refill_order.notify_time'] = ['lt', ($cur_time - $notify_time)];
             $condition['refill_order.notify_time'] = [['gt', $start_day], ['lt', ($cur_time - $notify_time)], 'and'];
         }
 

admin/templates/default/refill.order.monitor.notify.php

@@ -171,49 +171,51 @@
                         </option>
                     </select>
                 </td>
-                <th><label>订单耗时</label></th>
+                <th><label style="width: 86px;">当前耗时超过</label></th>
                 <td>
                     <select name="time" class="querySelect time">
                         <option value=""><?php echo $lang['nc_please_choose']; ?></option>
                         <option value="180"
-                                <?php if ($_GET['time'] == '180'){ ?>selected<?php } ?>>超过3分钟订单
+                                <?php if ($_GET['time'] == '180'){ ?>selected<?php } ?>>3分钟
                         </option>
                         <option value="300"
-                                <?php if ($_GET['time'] == '300'){ ?>selected<?php } ?>>超过5分钟订单
+                                <?php if ($_GET['time'] == '300'){ ?>selected<?php } ?>>5分钟
                         </option>
                         <option value="600"
-                                <?php if ($_GET['time'] == '600'){ ?>selected<?php } ?>>超过10分钟订单
+                                <?php if ($_GET['time'] == '600'){ ?>selected<?php } ?>>10分钟
                         </option>
                         <option value="900"
-                                <?php if ($_GET['time'] == '900'){ ?>selected<?php } ?>>超过15分钟订单
+                                <?php if ($_GET['time'] == '900'){ ?>selected<?php } ?>>15分钟
                         </option>
                         <option value="1200"
-                                <?php if ($_GET['time'] == '1200'){ ?>selected<?php } ?>>超过20分钟订单
+                                <?php if ($_GET['time'] == '1200'){ ?>selected<?php } ?>>20分钟
                         </option>
                         <option value="1800"
-                                <?php if ($_GET['time'] == '1800'){ ?>selected<?php } ?>>超过半小时订单
+                                <?php if ($_GET['time'] == '1800'){ ?>selected<?php } ?>>半小时
                         </option>
                         <option value="3600"
-                                <?php if ($_GET['time'] == '3600'){ ?>selected<?php } ?>>超过一小时订单
+                                <?php if ($_GET['time'] == '3600'){ ?>selected<?php } ?>>一小时
+                        </option>
+                        <option value="7200"
+                                <?php if ($_GET['time'] == '7200'){ ?>selected<?php } ?>>两小时
+                        </option>
+                        <option value="86400"
+                                <?php if ($_GET['time'] == '86400'){ ?>selected<?php } ?>>二十四小时
                         </option>
                     </select>
                 </td>
+                <th><label>订单</label></th>
                 <td>
                     <a style="margin-left:15px;" href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
                     </a>
-                    <a href="javascript:void(0);" id="ncexport" class="btns" >
-                        <span><i class="icon-edit"></i>导出</span>
-                    </a>
+                 
                 </td>
             </tr>
         </table>
         <table class="tb-type1 noborder search">
             <tr>
                 <td>
-                    <a href="javascript:void(0);" id="order_query" class="btns" >
-                        <span><i class="icon-edit"></i>更新待收货订单状态</span>
-                    </a>
                     <a href="#" class="btns" onclick="hCopyOrder(event)">
                         <span><i class="icon-edit"></i>拷贝我方订单号</span>
                     </a>
@@ -226,29 +228,40 @@
                     <a href="#" class="btns" onclick="hCopyMchOrder(event)">
                         <span><i class="icon-edit"></i>拷贝商家单号</span>
                     </a>
+
+                    <a href="javascript:void(0);" id="ncexport" class="btns" style="margin: 0 59px;">
+                        <span><i class="icon-edit"></i>导出Excel</span>
+                    </a>
+                    <a href="javascript:void(0);" id="order_query" class="btns">
+                        <span><i class="icon-edit"></i>更新待收货订单状态</span>
+                    </a>
+                    <a href="#" class="btns fail">
+                        <span><i class="icon-edit"></i>批量失败</span>
+                    </a>
                 </td>
             </tr>
             <tr>
                 <td>
-                <a href="#" class="btns fail"><span><i class="icon-edit"></i>批量失败</span></a>
+               
                 </td>
             </tr>
         </table>
     </form>
     <table class="table tb-type2" id="prompt">
         <tbody>
-        <tr class="space odd" id="autoClick">
+        <tr class="space odd" id="autoClick" >
             <th colspan="12">
-                <div class="title"><h5>
-                        数据统计</h5><span class="arrow"></span></div>
+                <div class="title" style="margin-top: 4px;">
+                    <h5>数据统计</h5><span class="arrow"></span>
+                </div>
+                <ul>
+                    <li class="lineLi" style="color:#000;">总计充值数量：<span class="refill_amounts"><?php echo $output['stat']['order_count'];?></span></li>
+                    <li class="lineLi" style="color:#000;">总计订单金额：<span class="order_count"><?php echo $output['stat']['refill_amounts'];?></span></li>
+                </ul>
             </th>
         </tr>
         <tr>
             <td>
-                <ul>
-                    <li class="lineLi" style="color:#000;">总计充值金额：<span class="refill_amounts"><?php echo $output['stat']['order_count'];?></span></li>
-                    <li class="lineLi" style="color:#000;">总计订单数量：<span class="order_count"><?php echo $output['stat']['refill_amounts'];?></span></li>
-                </ul>
                 <ul id="special_stat">
                     <?php if(!empty($output['special_stat'])) {
                         foreach ($output['special_stat'] as $stat){

admin/templates/default/refill.order.send.index.php

@@ -209,18 +209,12 @@
                     <a style="margin-left:15px;" href="javascript:void(0);" id="ncsubmit" class="btn-search "
                        title="<?php echo $lang['nc_query']; ?>">&nbsp;
                     </a>
-                    <a href="javascript:void(0);" id="ncexport" class="btns" >
-                        <span><i class="icon-edit"></i>导出</span>
-                    </a>
                 </td>
             </tr>
         </table>
         <table class="tb-type1 noborder search">
             <tr>
                 <td>
-                    <a href="javascript:void(0);" id="order_query" class="btns" >
-                        <span><i class="icon-edit"></i>更新待收货订单状态</span>
-                    </a>
                     <a href="#" class="btns" onclick="hCopyOrder(event)">
                         <span><i class="icon-edit"></i>拷贝我方订单号</span>
                     </a>
@@ -232,6 +226,12 @@
                     </a>
                     <a href="#" class="btns" onclick="hCopyMchOrder(event)">
                         <span><i class="icon-edit"></i>拷贝商家单号</span>
+                    </a> 
+                    <a href="javascript:void(0);" id="ncexport" class="btns" style="margin: 0 60px;">
+                        <span><i class="icon-edit"></i>导出Excel</span>
+                    </a>
+                    <a href="javascript:void(0);" id="order_query" class="btns" >
+                        <span><i class="icon-edit"></i>更新待收货订单状态</span>
                     </a>
                 </td>
             </tr>