Browse Source

管理员管理

lizhen_gitee 1 year ago
parent
commit
b5dd4dd1ea

+ 4 - 4
application/admin/controller/general/Profile.php

@@ -55,9 +55,9 @@ class Profile extends Backend
                 array_flip(array('email', 'nickname', 'password', 'avatar'))
             ));
             unset($v);
-            if (!Validate::is($params['email'], "email")) {
+           /* 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"));
@@ -65,10 +65,10 @@ class Profile extends Backend
                 $params['salt'] = Random::alnum();
                 $params['password'] = md5(md5($params['password']) . $params['salt']);
             }
-            $exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find();
+            /*$exist = Admin::where('email', $params['email'])->where('id', '<>', $this->auth->id)->find();
             if ($exist) {
                 $this->error(__("Email already exists"));
-            }
+            }*/
             if ($params) {
                 $admin = Admin::get($this->auth->id);
                 $admin->save($params);

+ 4 - 4
application/admin/validate/Admin.php

@@ -14,8 +14,8 @@ class Admin extends Validate
         'username' => 'require|regex:\w{3,30}|unique:admin',
         'nickname' => 'require',
         'password' => 'require|regex:\S{32}',
-        'email'    => 'require|email|unique:admin,email',
-        'mobile'   => 'regex:1[3-9]\d{9}|unique:admin,mobile',
+//        'email'    => 'require|email|unique:admin,email',
+//        'mobile'   => 'regex:1[3-9]\d{9}|unique:admin,mobile',
     ];
 
     /**
@@ -34,8 +34,8 @@ class Admin extends Validate
      * 验证场景
      */
     protected $scene = [
-        'add'  => ['username', 'email', 'nickname', 'password', 'mobile'],
-        'edit' => ['username', 'email', 'nickname', 'password', 'mobile'],
+        'add'  => ['username', 'nickname', 'password',],
+        'edit' => ['username', 'nickname', 'password',],
     ];
 
     public function __construct(array $rules = [], $message = [], $field = [])

+ 3 - 3
application/admin/view/auth/admin/add.html

@@ -15,7 +15,7 @@
     <div class="form-group">
         <label for="email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="email" class="form-control" id="email" name="row[email]" value="" data-rule="required;email" />
+            <input type="email" class="form-control" id="email" name="row[email]" value="" data-rule="" />
         </div>
     </div>
     <div class="form-group">
@@ -42,7 +42,7 @@
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-company_id" data-source="company/index" class="form-control selectpage" name="company_id" type="text" value="">
@@ -53,7 +53,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-staff_id" data-source="company_staff/index" data-field="truename" class="form-control selectpage" name="staff_id" type="text" value="">
         </div>
-    </div>
+    </div>-->
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 3 - 3
application/admin/view/auth/admin/edit.html

@@ -15,7 +15,7 @@
     <div class="form-group">
         <label for="email" class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input type="email" class="form-control" id="email" name="row[email]" value="{$row.email|htmlentities}" data-rule="required;email" />
+            <input type="email" class="form-control" id="email" name="row[email]" value="{$row.email|htmlentities}" data-rule="" />
         </div>
     </div>
     <div class="form-group">
@@ -48,7 +48,7 @@
             {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-company_id" data-rule="required" data-source="company/index" class="form-control selectpage" name="company_id" type="text" value="{$row.company_id|htmlentities}">
@@ -59,7 +59,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-staff_id" data-source="company_staff/index" data-field="truename" class="form-control selectpage" name="staff_id" type="text" value="{$row.staff_id|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group hidden layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 1
application/admin/view/general/profile/index.html

@@ -68,7 +68,7 @@
                         </div>
                         <div class="form-group">
                             <label for="email" class="control-label">{:__('Email')}:</label>
-                            <input type="text" class="form-control" id="email" name="row[email]" value="{$admin.email|htmlentities}" data-rule="required;email"/>
+                            <input type="text" class="form-control" id="email" name="row[email]" value="{$admin.email|htmlentities}" data-rule=""/>
                         </div>
                         <div class="form-group">
                             <label for="nickname" class="control-label">{:__('Nickname')}:</label>

+ 2 - 0
public/assets/js/backend/auth/admin.js

@@ -60,6 +60,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
     };
     return Controller;
 });
+/*
 $("#c-staff_id").data("params", function (obj) {
     return {
         custom: {company_id: $("#c-company_id").val()}
@@ -68,3 +69,4 @@ $("#c-staff_id").data("params", function (obj) {
 $(document).on("change","#c-company_id",function(){
     $("#c-staff_id").selectPageClear();
 })
+*/