diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 8ef7d35b..e6a7fe2d 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -33,7 +33,7 @@ CREATE TABLE `fa_admin` ( -- Records of fa_admin -- ---------------------------- BEGIN; -INSERT INTO `fa_admin` VALUES (1, 'admin', 'Admin', '', '', '/assets/img/avatar.png', 'admin@admin.com', 0, 1491635035, '127.0.0.1',1491635035, 1491635035, '', 'normal'); +INSERT INTO `fa_admin` VALUES (1, 'admin', 'Admin', '', '', '/assets/img/avatar.png', 'admin@admin.com', '', 0, 1491635035, '127.0.0.1',1491635035, 1491635035, '', 'normal'); COMMIT; -- ---------------------------- diff --git a/application/admin/controller/auth/Admin.php b/application/admin/controller/auth/Admin.php index 4f094b13..a7dc6da6 100644 --- a/application/admin/controller/auth/Admin.php +++ b/application/admin/controller/auth/Admin.php @@ -192,6 +192,7 @@ class Admin extends Backend $adminValidate->rule([ 'username' => 'require|regex:\w{3,30}|unique:admin,username,' . $row->id, 'email' => 'require|email|unique:admin,email,' . $row->id, + 'mobile' => 'regex:1[3-9]\d{9}|unique:admin,mobile,' . $row->id, 'password' => 'regex:\S{32}', ]); $result = $row->validate('Admin.edit')->save($params); diff --git a/application/admin/lang/zh-cn/auth/admin.php b/application/admin/lang/zh-cn/auth/admin.php index ff4143fb..4ef8d859 100644 --- a/application/admin/lang/zh-cn/auth/admin.php +++ b/application/admin/lang/zh-cn/auth/admin.php @@ -1,6 +1,8 @@ '电子邮箱', + 'Mobile' => '手机号', 'Group' => '所属组别', 'Loginfailure' => '登录失败次数', 'Login time' => '最后登录', diff --git a/application/admin/validate/Admin.php b/application/admin/validate/Admin.php index 3435f65c..92a8d366 100644 --- a/application/admin/validate/Admin.php +++ b/application/admin/validate/Admin.php @@ -15,6 +15,7 @@ class Admin extends Validate 'nickname' => 'require', 'password' => 'require|regex:\S{32}', 'email' => 'require|email|unique:admin,email', + 'mobile' => 'regex:1[3-9]\d{9}|unique:admin,mobile', ]; /** @@ -33,8 +34,8 @@ class Admin extends Validate * 验证场景 */ protected $scene = [ - 'add' => ['username', 'email', 'nickname', 'password'], - 'edit' => ['username', 'email', 'nickname', 'password'], + 'add' => ['username', 'email', 'nickname', 'password', 'mobile'], + 'edit' => ['username', 'email', 'nickname', 'password', 'mobile'], ]; public function __construct(array $rules = [], $message = [], $field = []) @@ -44,6 +45,7 @@ class Admin extends Validate 'nickname' => __('Nickname'), 'password' => __('Password'), 'email' => __('Email'), + 'mobile' => __('Mobile'), ]; $this->message = array_merge($this->message, [ 'username.regex' => __('Please input correct username'), diff --git a/application/admin/view/auth/admin/add.html b/application/admin/view/auth/admin/add.html index 35913cbf..3cb174e1 100644 --- a/application/admin/view/auth/admin/add.html +++ b/application/admin/view/auth/admin/add.html @@ -18,6 +18,12 @@ +
+ +
+ +
+
diff --git a/application/admin/view/auth/admin/edit.html b/application/admin/view/auth/admin/edit.html index cf9b1879..a36d0096 100644 --- a/application/admin/view/auth/admin/edit.html +++ b/application/admin/view/auth/admin/edit.html @@ -18,6 +18,12 @@
+
+ +
+ +
+
diff --git a/public/assets/js/backend/auth/admin.js b/public/assets/js/backend/auth/admin.js index 7fb1605d..09014109 100755 --- a/public/assets/js/backend/auth/admin.js +++ b/public/assets/js/backend/auth/admin.js @@ -35,6 +35,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'nickname', title: __('Nickname')}, {field: 'groups_text', title: __('Group'), operate:false, formatter: Table.api.formatter.label}, {field: 'email', title: __('Email')}, + {field: 'mobile', title: __('Mobile')}, {field: 'status', title: __("Status"), searchList: {"normal":__('Normal'),"hidden":__('Hidden')}, formatter: Table.api.formatter.status}, {field: 'logintime', title: __('Login time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {