Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

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));

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>