From 04e20af250df87987dcd7bb02b907e20889ca794 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 30 Apr 2019 17:59:08 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5framework?=
 =?UTF-8?q?=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/User.php            | 4 ++--
 application/admin/view/auth/index_search.html    | 2 +-
 application/admin/view/message/index_search.html | 2 +-
 application/admin/view/node/index.html           | 2 +-
 application/admin/view/queue/index_search.html   | 4 ++--
 application/admin/view/user/index_search.html    | 2 +-
 public/static/admin.js                           | 1 -
 7 files changed, 8 insertions(+), 9 deletions(-)

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 @@
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部 --','0'=>'已禁用的权限','1'=>'使用中的权限'] as $k=>$v}
+                    {foreach [''=>'-- 全部状态 --','0'=>'已禁用的权限','1'=>'使用中的权限'] as $k=>$v}
                     {eq name='Think.get.status' value='$k.""'}
                     <option selected value="{$k}">{$v}</option>
                     {else}
diff --git a/application/admin/view/message/index_search.html b/application/admin/view/message/index_search.html
index 18c1622a7..7c4a2428e 100644
--- a/application/admin/view/message/index_search.html
+++ b/application/admin/view/message/index_search.html
@@ -22,7 +22,7 @@
             <label class="layui-form-label">读取状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="read_state">
-                    {foreach [''=>'-- 全部 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v}
+                    {foreach [''=>'-- 全部状态 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v}
                     {eq name='Think.get.read_state' value='$k.""'}
                     <option selected value="{$k}">{$v}</option>
                     {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")}
-<button data-load='{:url("clear")}' class='layui-btn layui-btn-sm layui-btn-primary'>清理无效记录</button>
+<button data-load='{:url("clear")}' class='layui-btn layui-btn-sm layui-btn-primary'>清理记录</button>
 {/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 @@
             <label class="layui-form-label">任务指令</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="uri" lay-search>
-                    <option value="">-- 全部 --</option>
+                    <option value="">-- 全部指令 --</option>
                     {foreach $uris as $uri}
                     <!--{eq name='Think.get.uri' value='$uri'}-->
                     <option selected value="{$uri}">{$uri}</option>
@@ -37,7 +37,7 @@
             <label class="layui-form-label">任务状态</label>
             <div class="layui-input-inline">
                 <select name="status" class="layui-select">
-                    {foreach [''=>'-- 全部 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v}
+                    {foreach [''=>'-- 全部状态 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v}
                     <!--{if $Think.get.status eq $k}-->
                     <option selected value="{$k}">{$v}</option>
                     <!--{else}-->
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 @@
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部 --','0'=>'已禁用的账号','1'=>'使用中的账号'] as $k=>$v}
+                    {foreach [''=>'-- 全部状态 --','0'=>'已禁用的账号','1'=>'使用中的账号'] as $k=>$v}
                     {eq name='Think.get.status' value='$k.""'}
                     <option selected value="{$k}">{$v}</option>
                     {else}
diff --git a/public/static/admin.js b/public/static/admin.js
index 4d2b53e28..c275d43e4 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -159,7 +159,6 @@ $(function () {
         this.show = function (html) {
             $(this.selecter).html(html);
             $([0, 500, 1000]).map(function (index, time) {
-                console.log(arguments)
                 setTimeout(that.reInit, time)
             });
         };