diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 1a6b4f66..8ee807a6 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -42,6 +42,9 @@ class UsersController extends AbstractController
         $type = trim(Request::input('type'));
         $email = trim(Request::input('email'));
         $password = trim(Request::input('password'));
+        if(!$email){
+            return Base::retError('请输入邮箱地址');
+        }
         if ($type == 'reg') {
             $password2 = trim(Request::input('password2'));
             //邮箱
@@ -51,6 +54,9 @@ class UsersController extends AbstractController
             if (User::email2userid($email) > 0) {
                 return Base::retError('邮箱地址已存在');
             }
+            if (empty($password)) {
+                return Base::retError('请输入密码');
+            }
             if ($password != $password2) {
                 return Base::retError('确认密码输入不一致');
             }
@@ -75,6 +81,9 @@ class UsersController extends AbstractController
                     return Base::retError('请输入正确的验证码', ['code' => 'need']);
                 }
             }
+            if (empty($password)) {
+                return Base::retError('请输入密码');
+            }
             //
             $retError = function ($msg) use ($email) {
                 Cache::forever("code::" . $email, "need");
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index 1a732d8c..97e69e2b 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -237,12 +237,6 @@ export default {
 
         onLogin() {
             this.chackServerUrl(true).then(() => {
-                if (!this.email) {
-                    return;
-                }
-                if (!this.password) {
-                    return;
-                }
                 this.loadIng++;
                 this.$store.dispatch("call", {
                     url: 'users/login',