电表照片上传支持多种格式jpg,png,gif,doc,docx,xls,xlsx,zip,rar,pdf

application/admin/controller/Login.php

@@ -83,14 +83,14 @@ class Login extends Controller
             ];
             return $data;
         }
-           $status=(new StaffModel)->getStaffStatusByName($email);
-             if(!$status['status']==1){
-                 $data = [
-                    'status' => 0,
-                    'message' => '该账户当前禁用，请联系管理员开启'
-                ];
-                return $data;
-             }
+        $status=(new StaffModel)->getStaffStatusByName($email);
+         if(!$status['status']==1){
+             $data = [
+                'status' => 0,
+                'message' => '该账户当前禁用，请联系管理员开启'
+            ];
+            return $data;
+         }
         if(decrypt($passwd) == $staff->passwd->passwd){
             $user = [
                 'name'=> $staff->name,
@@ -117,7 +117,11 @@ class Login extends Controller
         $admin = AdminModel::get(['name'=>$name,'password'=>$passwd]);
 
         if(!$admin){
-            $this->error('用户名或密码错误');
+            $data = [
+                'status' => 0,
+                'message' => '用户名或密码错误'
+            ];
+            return $data;
         } else {
             loginlog($admin->name,$admin->id,'管理员用户成功登录系统',1);
             $user = [

application/admin/validate/LoginValidate.php

@@ -15,8 +15,8 @@ class LoginValidate extends Validate
     protected $message  =   [
         'name.require' => '名称必须',
         'name.max'     => '名称最多不能超过32个字符',
-        'name.token' => '非法的请求',
-        'password.require'=>'密码必填',
-         'verify.require'=>'验证码必填'
+        'name.token' => '非法的请求,请重新登录',
+        'password.require'=>'请填写密码',
+         'verify.require'=>'请填写验证码'
     ];
 }
\ No newline at end of file