diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js
index 7951cfd7d..8e756935a 100755
--- a/resources/assets/js/functions/common.js
+++ b/resources/assets/js/functions/common.js
@@ -360,7 +360,7 @@
          * @returns {boolean}
          */
         isEmail(email) {
-            return /^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/.test(email);
+            return /^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/i.test(email);
         },
 
         /**
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index b0bd355d2..2d7d67a1f 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -81,6 +81,7 @@ export default {
 
             loginType: 'login',
             loginJump: false,
+
             email: $A.getStorageString("cacheLoginEmail") || '',
             password: '',
             password2: '',
@@ -277,6 +278,12 @@ export default {
 
         onLogin() {
             this.chackServerUrl(true).then(() => {
+                this.email = $A.trim(this.email)
+                this.password = $A.trim(this.password)
+                this.password2 = $A.trim(this.password2)
+                this.code = $A.trim(this.code)
+                this.invite = $A.trim(this.invite)
+                //
                 if (!$A.isEmail(this.email)) {
                     $A.messageWarning("请输入正确的邮箱地址");
                     return;