Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

Application/Admin/Controller/ExportController.class.php

@@ -111,6 +111,14 @@ class ExportController extends Controller
                     }
                 }
 
+                if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
+                    $map['create_time'] = ['between', [strtotime(I('time_start')), strtotime(I('time_end')) + 86399]];
+                } elseif (isset($_REQUEST['time_start'])) {
+                    $map['create_time'] = ['GT', strtotime(I('time_start'))];
+                } elseif (isset($_REQUEST['time_end'])) {
+                    $map['create_time'] = ['LT', strtotime(I('time_end')) + 86399];
+                }
+
                 $csvFileName = $xlsName.'.csv';
                 //设置好告诉浏览器要下载excel文件的headers
                 header('Content-Description: File Transfer');

Application/Admin/View/AuthManager/user.html

@@ -72,7 +72,9 @@
 		</div>
 	</div>
 	<div class="tabcon1711">
-		<a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('index')}" style="margin-top: 0;float: right">
+		<a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('index')}" style="margin-top: 0;float: right;    color: #000000;
+    background: #ffffff;
+    border: solid 1px #000;">
 			返回
 		</a></div>
 

Application/Admin/View/User/rolelist.html

@@ -167,6 +167,8 @@
                 'promote_id'=>I('promote_id'),
                 'game_type'=>I('game_type'),
 								'xlsname'=>'玩家_角色查询',
+								'time_start'=>I('time_start'),
+								'time_end'=>I('time_end'),
                 ))}">导出</a>
         {$_page}
     </div>