From 5f5aabea197afedbf0105d1c00bfeb9c6b5c80ee Mon Sep 17 00:00:00 2001 From: jianglong Date: Mon, 13 Nov 2023 08:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/general/Profile.php | 16 ++++++++-------- .../admin/controller/qingdong/department/Staff.php | 1 - application/admin/library/Auth.php | 1 - application/admin/view/general/profile/index.html | 8 ++++---- application/admin/view/index/login.html | 1 + application/admin/view/index/register.html | 3 +++ .../admin/view/qingdong/product/company/edit.html | 4 ++-- application/common/controller/Backend.php | 5 ++--- application/config.php | 2 +- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/application/admin/controller/general/Profile.php b/application/admin/controller/general/Profile.php index 47c4ff2..eb84684 100644 --- a/application/admin/controller/general/Profile.php +++ b/application/admin/controller/general/Profile.php @@ -59,13 +59,13 @@ class Profile extends Backend // if (!Validate::is($params['email'], "email")) { // $this->error(__("Please input correct email")); // } -// if (isset($params['password'])) { -// if (!Validate::is($params['password'], "/^[\S]{6,30}$/")) { -// $this->error(__("Please input correct password")); -// } -// $params['salt'] = Random::alnum(); -// $params['password'] = md5(md5($params['password']) . $params['salt']); -// } + if (isset($params['password'])) { + if (!Validate::is($params['password'], "/^[\S]{6,30}$/")) { + $this->error(__("Please input correct password")); + } + $params['salt'] = Random::alnum(); + $params['password'] = md5(md5($params['password']) . $params['salt']); + } // $exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find(); // if ($exist) { // $this->error(__("Email already exists")); @@ -73,7 +73,7 @@ class Profile extends Backend if ($params) { $admin = Session::get('admin')?Session::get('admin'):Session::get('member'); if(!$admin){ - $this->redirect('index/register', [], 302); + $this->redirect('index/login', [], 302); } $admin = Admin::get($admin['id']); diff --git a/application/admin/controller/qingdong/department/Staff.php b/application/admin/controller/qingdong/department/Staff.php index e7eb8be..8b6c33e 100644 --- a/application/admin/controller/qingdong/department/Staff.php +++ b/application/admin/controller/qingdong/department/Staff.php @@ -173,7 +173,6 @@ class Staff extends Base { } Db::commit(); }catch (Exception $e){ - var_dump($e); Db::rollback(); $this->error($e->getMessage()); } diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index 0c6d0b8..64de757 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -156,7 +156,6 @@ class Auth extends \fast\Auth { $admin = Admin::get(intval($this->id)); if ($admin) { - var_dump(111122222); $admin->token = ''; $admin->save(); } diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html index a1c8e4c..d5240f5 100644 --- a/application/admin/view/general/profile/index.html +++ b/application/admin/view/general/profile/index.html @@ -75,10 +75,10 @@ - - - - +
+ + +
diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html index 68d4a5f..287bfeb 100644 --- a/application/admin/view/index/login.html +++ b/application/admin/view/index/login.html @@ -133,6 +133,7 @@
+ 切换手机号登录 diff --git a/application/admin/view/index/register.html b/application/admin/view/index/register.html index 0727b67..37d6e72 100644 --- a/application/admin/view/index/register.html +++ b/application/admin/view/index/register.html @@ -96,6 +96,7 @@
+

@@ -116,9 +117,11 @@
+
+ 切换账号密码登录 diff --git a/application/admin/view/qingdong/product/company/edit.html b/application/admin/view/qingdong/product/company/edit.html index a2177a0..d7f6a34 100644 --- a/application/admin/view/qingdong/product/company/edit.html +++ b/application/admin/view/qingdong/product/company/edit.html @@ -15,7 +15,7 @@
-
@@ -23,7 +23,7 @@
-
diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 1055c2c..022348d 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -158,16 +158,15 @@ class Backend extends Controller // 检测是否需要验证登录 if (!$this->auth->match($this->noNeedLogin)) { //检测是否登录 - var_dump($admin); if (!$this->auth->isLogin() && !$this->auth->isMemberLogin()) { Hook::listen('admin_nologin', $this); $url = Session::get('referer'); $url = $url ? $url : $this->request->url(); if (in_array($this->request->pathinfo(), ['/', 'index/index'])) { - $this->redirect('index/register', [], 302, ['referer' => $url]); + $this->redirect('index/login', [], 302, ['referer' => $url]); exit; } - $this->error(__('Please login first'), url('index/register', ['url' => $url])); + $this->error(__('Please login first'), url('index/login', ['url' => $url])); } // // 判断是否需要验证权限 diff --git a/application/config.php b/application/config.php index 0695ec5..93fa92e 100644 --- a/application/config.php +++ b/application/config.php @@ -277,7 +277,7 @@ return [ //登录页默认背景图 'login_background' => "", //是否启用多级菜单导航 - 'multiplenav' => false, + 'multiplenav' => true, //是否开启多选项卡(仅在开启多级菜单时起作用) 'multipletab' => true, //是否默认展示子菜单