2023-11-3-1

src/views/LoginPage.vue

@@ -50,7 +50,7 @@
 								class="login_form_input"
 								placeholder="Enter your email address"
 								v-model="email"
-								@keydown.enter="emailNextStepFun()"
+								@keydown.enter="submitPerLogin()"
 							/>
 
 						<!-- 邮箱登录 start -->
@@ -116,10 +116,10 @@
 						</div>
 
 						<div  class="login_form_title marign_top30">
-							<label>
-							<input type="checkbox" v-model="checked">
-							<span>I agree to all Term, Privacy Policy and Fees</span>
-						</label>
+							<label :class="{active:emailStap == 2}">
+								<input :state="emailStap" type="checkbox" v-model="checked">
+								<span>I agree to all Term, Privacy Policy and Fees</span>
+							</label>
 						</div>
 						
 						<div
@@ -372,60 +372,63 @@ export default defineComponent({
         //提交账号密码预先登录
         submitPerLogin() {
 			//输入账号密码
+			console.log(this.emailStap);
+			
 			if(this.emailStap>=2){
 				return;
 			}else{
-				if (!this.username || !this.password || !this.email) {
-                message.warning("Please enter your password");
-                return;
-            }
-			//输入邮箱
-			if (!this.email) {
-                message.warning("Please enter your email address");
-                return;
-            }
-			//判断邮箱格式是否正确
-			if (!isEmail(this.email)) {
-                message.warning("The email format is incorrect");
-                return;
-            }
-			//判断是否同意隐私政策
-			if (!this.checked) {
-                message.warning("Agree to all terms, privacy fees and policies");
-                return;
-            }
-            let data = {
-                password: md5(this.password + "abc"),
-                userName: this.username,
-                email: this.email,
-				operationType:"LOGIN",
-				ip:"",
-            };
-			// this.loginType = 'email'
-			// this.emailStap = 2;
-			if(this.loginTime){
-				this.loginTime = false
-				Https.axiosPost(Https.httpUrls.preLogin, data).then(
-                (rv: any) => {
-                    // if (rv) {
-                    //     this.loginType = 'email'
-                    // }
+				if (!this.username || !this.password) {
+					message.warning("Please enter your account number or password");
+					return;
+				}
+				//输入邮箱
+				if (!this.email) {
+					message.warning("Please enter your email address");
+					return;
+				}
+				//判断邮箱格式是否正确
+				if (!isEmail(this.email)) {
+					message.warning("The email format is incorrect");
+					return;
+				}
+				//判断是否同意隐私政策
+				if (!this.checked) {
+					message.warning("Agree to all terms, privacy fees and policies");
+					return;
+				}
+				let data = {
+					password: md5(this.password + "abc"),
+					userName: this.username,
+					email: this.email,
+					operationType:"LOGIN",
+					ip:"",
+				};
+				// this.loginType = 'email'
+				this.emailStap = 2;
+				if(this.loginTime){
+					this.loginTime = false
+					Https.axiosPost(Https.httpUrls.preLogin, data).then(
+					(rv: any) => {
+						// if (rv) {
+						//     this.loginType = 'email'
+						// }
+						
+						if (rv) {
+							this.userId = rv.userId
+							this.loginType = 'email'
+							this.time = 60;
+							this.emailCode = ["", "", "", "", "", ""]
+							this.createTimer();
+						}
+					}
+					).catch(res=>{
+						this.emailStap = 1;
+					});;
 					
-					if (rv) {
-                        this.userId = rv.userId
-                        this.loginType = 'email'
-                        this.emailStap = 2;
-                        this.time = 60;
-                        this.emailCode = ["", "", "", "", "", ""]
-                        this.createTimer();
-                    }
-                }
-				);
-				
-				setTimeout(() => {
-					this.loginTime = true
-				}, 2000);
-			}
+					setTimeout(() => {
+						this.loginTime = true
+					}, 2000);
+				}
 		
 			}
         },
@@ -596,6 +599,12 @@ export default defineComponent({
 							margin-left: 10px;
 							font-weight: normal;
 						}
+						&.active{
+							pointer-events:none;
+							input{
+								pointer-events:none;
+							}
+						}
 					}
                 }