diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php index 7dcf28ff7..2d4022100 100644 --- a/application/admin/controller/Config.php +++ b/application/admin/controller/Config.php @@ -16,6 +16,7 @@ namespace app\admin\controller; use controller\BasicAdmin; use service\LogService; +use service\WechatService; /** * 后台参数配置控制器 diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index c133ee7ec..096d652ea 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -59,9 +59,10 @@ class Login extends BasicAdmin strlen($username) < 4 && $this->error('登录账号长度不能少于4位有效字符!'); strlen($password) < 4 && $this->error('登录密码长度不能少于4位有效字符!'); // 用户信息验证 - $user = Db::name('SystemUser')->where('username', $username)->find(); + $user = Db::name('SystemUser')->where('is_deleted', '0')->where('username', $username)->find(); empty($user) && $this->error('登录账号不存在,请重新输入!'); ($user['password'] !== md5($password)) && $this->error('登录密码与账号不匹配,请重新输入!'); + empty($user['is_deleted']) || $this->error('账号已经被删除,请联系管理!'); empty($user['status']) && $this->error('账号已经被禁用,请联系管理!'); // 更新登录信息 $data = ['login_at' => Db::raw('now()'), 'login_num' => Db::raw('login_num+1')]; diff --git a/application/admin/view/auth/index.html b/application/admin/view/auth/index.html index 736c40d54..0cc90f61a 100644 --- a/application/admin/view/auth/index.html +++ b/application/admin/view/auth/index.html @@ -19,7 +19,7 @@ - -
+ @@ -35,7 +35,7 @@
+ diff --git a/application/admin/view/log/index.html b/application/admin/view/log/index.html index 079d0034c..112240008 100644 --- a/application/admin/view/log/index.html +++ b/application/admin/view/log/index.html @@ -67,7 +67,7 @@ - @@ -81,7 +81,7 @@ - diff --git a/application/admin/view/menu/index.html b/application/admin/view/menu/index.html index 63b95fa13..1942c5f09 100644 --- a/application/admin/view/menu/index.html +++ b/application/admin/view/menu/index.html @@ -18,7 +18,7 @@
+ 操作账号
+ {$vo.username}
- -
+ @@ -34,7 +34,7 @@
+ diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html index 5f28c9a20..42d50f43c 100644 --- a/application/admin/view/node/index.html +++ b/application/admin/view/node/index.html @@ -45,21 +45,21 @@ {if auth("$classuri/save") and $vo.spt eq 1} -