diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index fe78a38..ca51f10 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -63,7 +63,7 @@ class Admin extends AuthController $form[] = Elm::input('name', '登录账号')->col(10); $form[] = Elm::input('nickname', '昵称')->col(10); $form[] = Elm::frameImage('avatar', '头像', Url::buildUrl('admin/images/index', array('fodder' => 'avatar', 'limit' => 1)))->icon("ios-image")->width('96%')->height('440px')->col(10); - $form[] = Elm::password('pwd', '密码')->col(10); + $form[] = Elm::password('password', '密码')->col(10); $form[] = Elm::input('realname', '真实姓名')->col(10); $form[] = Elm::select('role_id', '角色')->options(function () { $list = rModel::getAuthLst(); @@ -95,7 +95,7 @@ class Admin extends AuthController $form[] = Elm::input('name', '登录账号', $ainfo['name'])->col(10); $form[] = Elm::input('nickname', '昵称', $ainfo['nickname'])->col(10); $form[] = Elm::frameImage('avatar', '头像', Url::buildUrl('admin/images/index', array('fodder' => 'avatar', 'limit' => 1)), $ainfo['avatar'])->icon("ios-image")->width('96%')->height('440px')->col(10); - $form[] = Elm::password('pwd', '密码', $ainfo['pwd'])->col(10); + $form[] = Elm::password('password', '密码', $ainfo['password'])->col(10); $form[] = Elm::input('realname', '真实姓名', $ainfo['realname'])->col(10); $form[] = Elm::select('role_id', '角色', $ainfo['role_id'])->options(function () { $list = rModel::getAuthLst(); @@ -124,7 +124,7 @@ class Admin extends AuthController ['name', ''], ['nickname', ''], ['avatar', ''], - ['pwd', ''], + ['password', ''], ['realname', ''], ['role_id', ''], ['tel', ''], @@ -132,7 +132,7 @@ class Admin extends AuthController ['status', ''] ]); if ($data['name'] == "") return app("json")->fail("登录账号不能为空"); - if ($data['pwd'] == "") return app("json")->fail("密码不能为空"); + if ($data['password'] == "") return app("json")->fail("密码不能为空"); if ($data['tel'] == "") return app("json")->fail("手机号不能为空"); if ($data['mail'] == "") return app("json")->fail("邮箱不能为空"); if (is_array($data['avatar'])) $data['avatar'] = $data['avatar'][0]; @@ -142,14 +142,14 @@ class Admin extends AuthController if ($info) { return app("json")->fail("用户已存在"); } - $data['pwd'] = md5(md5($data['pwd'])); + $data['password'] = md5(md5($data['password'])); $data['ip'] = $this->request->ip(); $data['create_user'] = $this->adminId; $data['create_time'] = time(); $res = aModel::insert($data); } else { $ainfo = aModel::get($id); - if ($ainfo['pwd'] != $data['pwd']) $data['pwd'] = md5(md5($data['pwd'])); + if ($ainfo['password'] != $data['password']) $data['password'] = md5(md5($data['password'])); $data['update_user'] = $this->adminId; $data['update_time'] = time(); $res = aModel::update($data, ['id' => $id]); @@ -181,7 +181,7 @@ class Admin extends AuthController ]); if ($data['oldpwd'] == '' || $data['newpwd'] == '') return app("json")->fail("参数有误,新旧密码为空!"); $adminInfo = aModel::get($this->adminId); - if ($adminInfo['pwd'] == md5(md5($data['oldpwd']))) return aModel::update(['pwd' => md5(md5($data['newpwd']))], ['id' => $this->adminId]) ? app("json")->success("操作成功") : app("json")->fail("操作失败"); + if ($adminInfo['password'] == md5(md5($data['oldpwd']))) return aModel::update(['password' => md5(md5($data['newpwd']))], ['id' => $this->adminId]) ? app("json")->success("操作成功") : app("json")->fail("操作失败"); return app("json")->fail("密码不正确!"); } diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index b07c305..6a512af 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -34,7 +34,7 @@ class Login extends AuthController */ public function verify() { - list($account, $pwd, $verify) = Util::postMore(['account', 'pwd', 'verify'], null, true); + list($account, $pwd, $verify) = Util::postMore(['account', 'password', 'verify'], null, true); if (empty($account) || empty($pwd)) return app("json")->fail("账号、密码和验证码不能为空!"); // 验证码验证 if (!captcha_check($verify)) return app("json")->fail("验证码不正确!"); diff --git a/app/admin/view/admin/index.html b/app/admin/view/admin/index.html index d525c3a..ff8fe8f 100644 --- a/app/admin/view/admin/index.html +++ b/app/admin/view/admin/index.html @@ -1,7 +1,7 @@ - 用户管理 - {:system_config("title")}后台管理系统 + 用户管理 - {:system_config('title')}后台管理系统 {include file="public/header" /} diff --git a/app/admin/view/admin/profile.html b/app/admin/view/admin/profile.html index e4d58e4..cd48182 100644 --- a/app/admin/view/admin/profile.html +++ b/app/admin/view/admin/profile.html @@ -3,15 +3,11 @@ - 个人信息 - {:system_config("title")}后台管理系统 - - - - + 个人信息 - {:system_config('title')}后台管理系统 + + + + diff --git a/app/admin/view/admin/pwd.html b/app/admin/view/admin/pwd.html index 8c9675a..a9caa26 100644 --- a/app/admin/view/admin/pwd.html +++ b/app/admin/view/admin/pwd.html @@ -3,15 +3,11 @@ - 修改密码 - {:system_config("title")}后台管理系统 - - - - + 修改密码 - {:system_config('title')}后台管理系统 + + + + diff --git a/app/admin/view/admin_auth/index.html b/app/admin/view/admin_auth/index.html index d1a8fe3..de73b4b 100644 --- a/app/admin/view/admin_auth/index.html +++ b/app/admin/view/admin_auth/index.html @@ -1,7 +1,7 @@ - 登录页面 - {:system_config("title")}后台管理系统 + 登录页面 - {:system_config('title')}后台管理系统 {include file="public/header" /} diff --git a/app/admin/view/admin_log/index.html b/app/admin/view/admin_log/index.html index 820908b..11e3349 100644 --- a/app/admin/view/admin_log/index.html +++ b/app/admin/view/admin_log/index.html @@ -1,7 +1,7 @@ - 操作日志 - {:system_config("title")}后台管理系统 + 操作日志 - {:system_config('title')}后台管理系统 {include file="public/header" /} diff --git a/app/admin/view/admin_notify/index.html b/app/admin/view/admin_notify/index.html index 82809fb..526dbc4 100644 --- a/app/admin/view/admin_notify/index.html +++ b/app/admin/view/admin_notify/index.html @@ -2,7 +2,7 @@ - 我的信息 - {:system_config("title")}后台管理系统 + 我的信息 - {:system_config('title')}后台管理系统 {include file="public/header" /}