Browse Source

修改登录组织号下未创建账号问题

11wqe1 1 day ago
parent
commit
16fd564117
1 changed files with 19 additions and 13 deletions
  1. 19 13
      src/views/login/loginPage.vue

+ 19 - 13
src/views/login/loginPage.vue

@@ -289,19 +289,25 @@ export default {
 				) {
 					return this.$message.error("账号不可登录,请使用您的专属网址");
 				}
-			} 
-			// else {
-			// 	let mergedList = this.allowOrgList.reduce((acc, curr) => {
-			// 		return [...acc, ...curr.list];
-			// 	}, []);
-			// 	if (
-			// 		mergedList.includes(
-			// 			this.OrgOptions.find((i) => i.Uorg == this.org).id
-			// 		)
-			// 	) {
-			// 		return this.$message.error("账号不可登录,请使用您的专属网址");
-			// 	}
-			// }
+			} else {
+				console.log('this.org',this.org);
+				
+				let mergedList = this.allowOrgList.reduce((acc, curr) => {
+					return [...acc, ...curr.list];
+				}, []);
+				if (this.OrgOptions.find((i) => i.Uorg == this.org)){
+					if (
+						mergedList.includes(
+							this.OrgOptions.find((i) => i.Uorg == this.org).id
+						)
+					) {
+						return this.$message.error("账号不可登录,请使用您的专属网址");
+					}
+				}else{
+						return this.$message.error("还未在此组织下创建账号,请先创建");
+				}
+			}
+
 			let str = this.account.replace(/(^\s*)|(\s*$)/g, "");
 			if (!this.org && !regEmail.test(str)) {
 				// this.$message.error(