From ef250272132ebcc51a24705f52867152291cfd78 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Thu, 28 Nov 2019 15:51:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A5=E9=93=BE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=87=E5=88=86=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/Mend/lists.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html
index 2e87bce63..8cb0c4723 100644
--- a/Application/Admin/View/Mend/lists.html
+++ b/Application/Admin/View/Mend/lists.html
@@ -107,6 +107,7 @@
                         <th>补链前渠道</th>
                         <th>补链后渠道</th>
                         <th style="width: 450px;">备注</th>
+                        <th>切分时间</th>
                         <th>补链时间</th>
                         <th>操作人员</th>
                     </tr>
@@ -126,6 +127,7 @@
                             <td class="js-pop" >
                                 <a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{:get_title($data['remark'])}</a>
                             </td>
+                            <td>{$data.order_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                             <td>{$data.op_account}</td>
                         </tr>

From e962786e0713300de2be544f93665aec335e4156 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Thu, 28 Nov 2019 15:58:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E3=80=90=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E3=80=91-=E3=80=90=E5=B9=B3=E5=8F=B0=E5=B8=81?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E3=80=91=E5=AF=BC=E5=87=BA=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index dc9e97c15..e6e6fb766 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -49,10 +49,9 @@ class ExportController extends Controller
     //导出Excel
     function expUser($id)
     {
-                $xlsName = $_REQUEST['xlsname'];
+        $xlsName = $_REQUEST['xlsname'];
         switch ($id) {
             case 1:
-
                 $xlsCell = array(
                     array('user_account', "玩家账号"),
                     array('game_name', "游戏名称"),
@@ -861,10 +860,11 @@ class ExportController extends Controller
                     $map['spend_ip'] = array('like', '%' . trim($_REQUEST['spend_ip']) . '%');
                     unset($_REQUEST['spend_ip']);
                 }
-                if (isset($_REQUEST['time-start']) && isset($_REQUEST['time-end'])) {
-                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['time-start']), strtotime($_REQUEST['time-end']) + 24 * 60 * 60 - 1));
-                    unset($_REQUEST['time-start']);
-                    unset($_REQUEST['time-end']);
+
+                if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+                    $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['timestart']), strtotime($_REQUEST['timeend']) + 24 * 60 * 60 - 1));
+                    unset($_REQUEST['timestart']);
+                    unset($_REQUEST['timeend']);
                 }
                 if (isset($_REQUEST['start']) && isset($_REQUEST['end'])) {
                     $map['pay_time'] = array('BETWEEN', array(strtotime($_REQUEST['start']), strtotime($_REQUEST['end']) + 24 * 60 * 60 - 1));