diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 87f797ad8..3b6ab99a6 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -45,8 +45,8 @@ class User extends Controller public function index() { $this->title = '系统用户管理'; - $where = ['is_deleted' => '0']; - $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status')->where($where)->page(); + $query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status'); + $query->where(['is_deleted' => '0'])->order('id desc')->page(); } /** diff --git a/application/admin/view/auth/index_search.html b/application/admin/view/auth/index_search.html index c6aacc422..84a9c232c 100644 --- a/application/admin/view/auth/index_search.html +++ b/application/admin/view/auth/index_search.html @@ -17,7 +17,7 @@
- {foreach [''=>'-- 全部 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v} + {foreach [''=>'-- 全部状态 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v} {eq name='Think.get.read_state' value='$k.""'} {else} diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html index 37c65a2c3..300e75f24 100644 --- a/application/admin/view/node/index.html +++ b/application/admin/view/node/index.html @@ -2,7 +2,7 @@ {block name='button'} {if auth("admin/node/clear")} - + {/if} {/block} diff --git a/application/admin/view/queue/index_search.html b/application/admin/view/queue/index_search.html index baf787b18..058aa7d01 100644 --- a/application/admin/view/queue/index_search.html +++ b/application/admin/view/queue/index_search.html @@ -22,7 +22,7 @@
- {foreach [''=>'-- 全部 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v} + {foreach [''=>'-- 全部状态 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v} diff --git a/application/admin/view/user/index_search.html b/application/admin/view/user/index_search.html index 0000bf1f4..6f380c4b2 100644 --- a/application/admin/view/user/index_search.html +++ b/application/admin/view/user/index_search.html @@ -29,7 +29,7 @@