Merge remote-tracking branch 'origin/StableVersion' into dev_vite

src/component/Detail/model/modelPosition.vue

@@ -119,7 +119,9 @@ export default defineComponent({
 							// detailData.frontBack.back[index].style[key] = value*sacle+'px'
 						}
 					});
-					emit('modelOnLoad')
+					setTimeout(() => {
+						emit('modelOnLoad')
+					});
 				};
 				img.src = detailData.frontBack?.body?.path;
 			})

src/component/LoginPage/login/personal.vue

@@ -68,6 +68,7 @@
 					<div class="codeEmail">We’ve sent an code to your email <span>{{ email }}</span></div>
 					<div class="codeEmailInput">
 						<VerificationCodeInput
+						ref="verificationCodeInputDom"
 						:ct="emailCode"
 						@sendCaptcha="submitEmailLogin($event)"
 						></VerificationCodeInput>
@@ -97,7 +98,9 @@
             <div
               class="login_submit_button"
               :state="emailStap"
+			  :class="{'active':animation}"
               @click="submitPerLogin()"
+			  @mousedown="loginBtnMousedown"
             >
               Sign in
             </div>
@@ -302,6 +305,8 @@ export default defineComponent({
       passwordType: "password",
       userId: "",
       loginTime: true,
+	  animation: false,
+	  inputCodeTime: null as any,
     };
   },
   onBeforeUnmount() {
@@ -415,6 +420,16 @@ export default defineComponent({
     submitPerLogin() {
       //输入账号密码
       if (this.emailStap >= 2) {
+		let verificationCodeInputDom:any = this.$refs.verificationCodeInputDom
+		let code =  verificationCodeInputDom.getCtData.map(item => item).join('');
+		console.log(code)
+		if(code.length !== this.emailCode.length){
+			message.info("Please enter the complete verification code.");
+		}else{
+			this.submitEmailLogin(code)
+		}
+
+		//提交验证码
         return;
       } else {
         if (!this.password) {
@@ -482,20 +497,23 @@ export default defineComponent({
 
     //邮箱登录提交
     submitEmailLogin(emailVerifyCode: any) {
-      let data = {
+		clearTimeout(this.inputCodeTime)
-        email: this.email,
+		this.inputCodeTime = setTimeout(()=>{
-        emailVerifyCode: emailVerifyCode,
+			let data = {
-        loginType: "EMAIL",
+				email: this.email,
-        userId: this.userId,
+				emailVerifyCode: emailVerifyCode,
-      };
+				loginType: "EMAIL",
-	  this.$emit('update:isMask',true)
+				userId: this.userId,
-      Https.axiosPost(Https.httpUrls.accountLogin, data)
+			};
-        .then((rv: any) => {
+			this.$emit('update:isMask',true)
-          this.setSuccessLogin(rv);
+			Https.axiosPost(Https.httpUrls.accountLogin, data)
-        })
+				.then((rv: any) => {
-        .catch((res) => {
+				this.setSuccessLogin(rv);
-			this.$emit('update:isMask',false)
+				})
-		});
+				.catch((res) => {
+					this.$emit('update:isMask',false)
+				});
+		},1000)
     },
     isCheckAgreement() {
       message.info("Agree to all terms, privacy fees and policies");
@@ -600,7 +618,15 @@ export default defineComponent({
     //         }
     //     );
     // },
-  },
+	loginBtnMousedown(){
+		this.animation = true
+		let mouseup = ()=>{
+			this.animation = false
+			document.removeEventListener('mouseup',mouseup)
+		}
+		document.addEventListener('mouseup',mouseup)
+	},
+},
   mounted() {
   },
 });
@@ -761,13 +787,12 @@ export default defineComponent({
         transition: all 0.3s;
 		margin-top: 5rem;
 		font-weight: 600;
-
+		&.active{
+			transform: scale(.9);
+		}
         &:hover {
           background: #3c3c3c;
         }
-        &[state="2"] {
-          cursor: not-allowed;
-        }
       }
 	  .NewAccount{
 		font-size: 1.6rem;
@@ -776,6 +801,8 @@ export default defineComponent({
 		margin-top: 1.2rem;
 		text-align: left;
 		cursor: pointer;
+		width: min-content;
+		white-space: nowrap;
 	  }
 	  .segmentation{
 		margin-top: 4rem;

src/component/LoginPage/login/school.vue

@@ -90,6 +90,7 @@
 					<div class="codeEmail">We’ve sent an code to your email <span>{{ email }}</span></div>
 					<div class="codeEmailInput">
 						<VerificationCodeInput
+						ref="verificationCodeInputDom"
 						:ct="emailCode"
 						@sendCaptcha="submitEmailLogin($event)"
 						></VerificationCodeInput>
@@ -125,9 +126,11 @@
 							</div>
 						</div> -->
             <div
-              class="login_submit_button marign_top40"
+			class="login_submit_button"
               :state="emailStap"
+			  :class="{'active':animation}"
               @click="submitPerLogin()"
+			  @mousedown="loginBtnMousedown"
             >
               Sign in
             </div>
@@ -310,6 +313,8 @@ export default defineComponent({
       passwordType: "password",
       userId: "",
       loginTime: true,
+	  animation: false,
+	  inputCodeTime: null as any,
     };
   },
   onBeforeUnmount() {
@@ -421,6 +426,16 @@ export default defineComponent({
     submitPerLogin() {
       //输入账号密码
       if (this.emailStap >= 2) {
+        let verificationCodeInputDom:any = this.$refs.verificationCodeInputDom
+		let code =  verificationCodeInputDom.getCtData.map(item => item).join('');
+		console.log(code)
+		if(code.length !== this.emailCode.length){
+			message.info("Please enter the complete verification code.");
+		}else{
+			this.submitEmailLogin(code)
+		}
+
+		//提交验证码
         return;
       } else {
         if (!this.password) {
@@ -489,21 +504,24 @@ export default defineComponent({
 
     //邮箱登录提交
     submitEmailLogin(emailVerifyCode: any) {
-      let data = {
+		clearTimeout(this.inputCodeTime)
-        email: this.email,
+		this.inputCodeTime = setTimeout(()=>{
-        emailVerifyCode: emailVerifyCode,
+			let data = {
-        loginType: "EMAIL",
+				email: this.email,
-        userId: this.userId,
+				emailVerifyCode: emailVerifyCode,
-        organizationName: this.selectSchool,
+				loginType: "EMAIL",
-      };
+				userId: this.userId,
-	  this.$emit('update:isMask',true)
+				organizationName: this.selectSchool,
-      Https.axiosPost(Https.httpUrls.accountLogin, data)
+			};
-        .then((rv: any) => {
+			this.$emit('update:isMask',true)
-          this.setSuccessLogin(rv);
+			Https.axiosPost(Https.httpUrls.accountLogin, data)
-        })
+				.then((rv: any) => {
-        .catch((res) => {
+				this.setSuccessLogin(rv);
-			this.$emit('update:isMask',false)
+				})
-		});
+				.catch((res) => {
+					this.$emit('update:isMask',false)
+				});
+		},1000)
     },
     isCheckAgreement() {
       message.info("Agree to all terms, privacy fees and policies");
@@ -608,6 +626,14 @@ export default defineComponent({
     //         }
     //     );
     // },
+	loginBtnMousedown(){
+		this.animation = true
+		let mouseup = ()=>{
+			this.animation = false
+			document.removeEventListener('mouseup',mouseup)
+		}
+		document.addEventListener('mouseup',mouseup)
+	},
   },
   mounted() {
   },
@@ -785,13 +811,12 @@ export default defineComponent({
         transition: all 0.3s;
 		margin-top: 5rem;
 		font-weight: 600;
-
+		&.active{
+			transform: scale(.9);
+		}
         &:hover {
           background: #3c3c3c;
         }
-        &[state="2"] {
-          cursor: not-allowed;
-        }
       }
 	  .NewAccount{
 		font-size: 1.6rem;
@@ -800,6 +825,8 @@ export default defineComponent({
 		margin-top: 1.2rem;
 		text-align: left;
 		cursor: pointer;
+		width: min-content;
+		white-space: nowrap;
 	  }
 	  .segmentation{
 		margin-top: 4rem;