From 1e090fc6dd07c639f700f03d0b4da4225828cccb Mon Sep 17 00:00:00 2001
From: sunke <18850253506@163.com>
Date: Thu, 21 Nov 2019 19:50:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 6 ++++--
 Application/Home/View/default/Query/register.html        | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 76c7d09c2..2b1fe7df7 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -1738,8 +1738,8 @@ class DownloadController extends BaseController {
 		array('promote_account','推广账号'),
 		array('register_time','注册时间'),
 		array('register_ip','注册ip'),
-                array('login_time','登陆时间'),
-                array('login_ip','登陆ip')
+        array('login_time','登陆时间'),
+        array('login_ip','登陆ip')
 	    );
         $model = M('user','tab_');
         
@@ -1747,6 +1747,8 @@ class DownloadController extends BaseController {
         //var_dump($data);
         $xlsData = [];
         foreach ($data as $key1 => $value1) {
+           $value1['register_time'] = date("Y-m-d H:i:s",$value1['register_time']);
+           $value1['login_time'] = date("Y-m-d H:i:s",$value1['login_time']);
            $value1['account'] = $this->encryption($value1['account']); 
            $xlsData[] = $value1;
         }
diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html
index 8943277f3..673eb850c 100644
--- a/Application/Home/View/default/Query/register.html
+++ b/Application/Home/View/default/Query/register.html
@@ -72,8 +72,7 @@
         </div>
 
         <div class="form-group normal_space">
-          <input type="submit" class="submit" id='submit' url="{:U('Query/register','model='.$model['name'],false)}"
-                 value="查询">
+          <input type="submit" class="submit" id='submit' url="{:U('Query/register','model='.$model['name'],false)}"  value="查询">
         </div>
 
         <div class="form-group normal_space" style="margin-left: 46px;">