From d20dd126bb05e72ce6168ae647a1f8fd5df6ba1f Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 17 Apr 2019 14:13:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5=E6=9D=A5?= =?UTF-8?q?=E8=87=AAFramework=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Config.php | 2 - application/admin/controller/Login.php | 1 - application/admin/controller/User.php | 3 +- application/admin/controller/api/Plugs.php | 14 ---- application/admin/view/api/plugs/message.html | 65 ------------------- application/admin/view/auth/form.html | 4 +- application/admin/view/menu/form.html | 4 +- application/admin/view/message/index.html | 17 +++-- application/admin/view/node/index.html | 4 +- application/admin/view/user/auth.html | 16 +++-- application/admin/view/user/form.html | 26 ++++---- application/admin/view/user/pass.html | 4 +- 12 files changed, 42 insertions(+), 118 deletions(-) delete mode 100644 application/admin/view/api/plugs/message.html diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index e51e06cea..ce4cab13f 100644 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -31,7 +31,6 @@ class Config extends Controller /** * 系统参数配置 - * @return mixed * @throws \think\Exception * @throws \think\exception\PDOException */ @@ -49,7 +48,6 @@ class Config extends Controller /** * 文件存储配置 - * @return string * @throws \think\Exception * @throws \think\exception\PDOException */ diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index 1af362d27..374c2ec4d 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -16,7 +16,6 @@ namespace app\admin\controller; use library\Controller; use think\Db; -use think\Session; /** * 用户登录管理 diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index fc0121312..87f797ad8 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -45,7 +45,8 @@ class User extends Controller public function index() { $this->title = '系统用户管理'; - $this->_query($this->table)->where(['is_deleted' => '0'])->like('username,phone,mail')->dateBetween('login_at')->equal('status')->page(); + $where = ['is_deleted' => '0']; + $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status')->where($where)->page(); } /** diff --git a/application/admin/controller/api/Plugs.php b/application/admin/controller/api/Plugs.php index f61a600b8..74689fc63 100644 --- a/application/admin/controller/api/Plugs.php +++ b/application/admin/controller/api/Plugs.php @@ -200,18 +200,4 @@ class Plugs extends Controller $this->fetch(); } - /** - * 系统消息展示 - * @return mixed - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - */ - public function message() - { - $this->title = '系统消息'; - $this->list = Db::name('SystemMessage')->where(['read_state' => '0'])->order('id desc')->select(); - $this->fetch(); - } - } \ No newline at end of file diff --git a/application/admin/view/api/plugs/message.html b/application/admin/view/api/plugs/message.html deleted file mode 100644 index bcd24e7ff..000000000 --- a/application/admin/view/api/plugs/message.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {block name="title"}{$title|default=''}{if !empty($title)} · {/if}{:sysconf('site_name')}{/block} - - - - - - - - - - - -
-
- - 忽略 -
-
- - -
-
- - - - diff --git a/application/admin/view/auth/form.html b/application/admin/view/auth/form.html index 7790a85a0..705ddd2af 100644 --- a/application/admin/view/auth/form.html +++ b/application/admin/view/auth/form.html @@ -15,9 +15,7 @@
- - - + {notempty name='vo.id'}{/notempty}
diff --git a/application/admin/view/menu/form.html b/application/admin/view/menu/form.html index 3ee7d01b3..ad3ecd211 100644 --- a/application/admin/view/menu/form.html +++ b/application/admin/view/menu/form.html @@ -64,9 +64,7 @@
- - - + {notempty name='vo.id'}{/notempty}
diff --git a/application/admin/view/message/index.html b/application/admin/view/message/index.html index 5df5d51da..033bd9f97 100644 --- a/application/admin/view/message/index.html +++ b/application/admin/view/message/index.html @@ -4,11 +4,11 @@ {if auth("admin/message/onoff")}
- - - - - + {if sysconf('system_message_state')} + + {else} + + {/if}
{/if} diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html index 10876598f..37c65a2c3 100644 --- a/application/admin/view/node/index.html +++ b/application/admin/view/node/index.html @@ -1,9 +1,9 @@ {extend name='main'} {block name='button'} - +{if auth("admin/node/clear")} - +{/if} {/block} {block name='style'} diff --git a/application/admin/view/user/auth.html b/application/admin/view/user/auth.html index a874308e9..9e9b20404 100644 --- a/application/admin/view/user/auth.html +++ b/application/admin/view/user/auth.html @@ -13,24 +13,26 @@
+ {if isset($vo.username) and $vo.username eq 'admin'} + 超级用户不需要配置权限 + {else} {foreach $authorizes as $authorize} {/foreach} - {if empty($authorizes)}未配置权限{/if} + {empty name='authorizes'}未配置权限{/empty} + {/if}
- - - + {notempty name='vo.id'}{/notempty}
diff --git a/application/admin/view/user/form.html b/application/admin/view/user/form.html index 6813ff943..d8b80597e 100644 --- a/application/admin/view/user/form.html +++ b/application/admin/view/user/form.html @@ -3,7 +3,7 @@
- + @@ -13,32 +13,36 @@
- +
- +
- + {notempty name='authorizes'}
+ {if isset($vo.username) and $vo.username eq 'admin'} + 超级用户不需要配置权限 + {else} {foreach $authorizes as $authorize} {/foreach} - {if empty($authorizes)}未配置权限{/if} + {empty name='authorizes'}未配置权限{/empty} + {/if}
- + {/notempty}
@@ -48,9 +52,7 @@
- - - + {notempty name='vo.id'}{/notempty}
diff --git a/application/admin/view/user/pass.html b/application/admin/view/user/pass.html index bd8370852..507263f37 100644 --- a/application/admin/view/user/pass.html +++ b/application/admin/view/user/pass.html @@ -45,9 +45,7 @@
- - - + {notempty name='vo.id'}{/notempty}