11wqe1 hace 6 días
padre
commit
14b2308d98
Se han modificado 2 ficheros con 6 adiciones y 20 borrados
  1. 6 4
      src/views/HomeView.vue
  2. 0 16
      src/views/login/loginPage.vue

+ 6 - 4
src/views/HomeView.vue

@@ -69,12 +69,13 @@
 				<!-- 循环数组展示iframe  -->
 				<div v-for="(item, index) in AppJSon" :key="index">
 					<!-- {{ item }} -->
-					<div style="height: calc(100vh - 60px)" v-show="item.stateL">
+					<!-- style="height: calc(100vh - 60px)" -->
+					<div v-show="item.stateL">
 						<iframe
 							allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;"
 							frameborder="no"
 							@load="handleLoad"
-							style="border: 0; width: 100%; height: calc(100vh - 60px)"
+							style="border: 0; width: 100%; height: 100vh"
 							:src="item.json"
 							:ref="item.toolId"
 						>
@@ -83,12 +84,13 @@
 				</div>
 
 				<!-- 荔园首页定制工具,不保存缓存 -->
-				<div style="height: calc(100vh - 60px)" v-if="clearifa">
+				<!-- style="height: calc(100vh - 60px)" -->
+				<div v-if="clearifa">
 					<iframe
 						allow="camera *; microphone *; display-capture; midi; encrypted-media; fullscreen; geolocation; clipboard-read; clipboard-write; accelerometer; autoplay; gyroscope; payment; picture-in-picture; usb; xr-spatial-tracking;"
 						frameborder="no"
 						@load="handleLoad"
-						style="border: 0; width: 100%; height: calc(100vh - 60px)"
+						style="border: 0; width: 100%; height: 100vh"
 						:src="clearifa"
 					>
 					</iframe>

+ 0 - 16
src/views/login/loginPage.vue

@@ -950,22 +950,6 @@ export default {
 					this.account = _data.username;
 					await this.getOrgData();
 
-					// if (
-					// 	(this.allowOrgList.find((i) => i.id == this.org2) &&
-					// 		parent.location.href.includes("lyxx")) ||
-					// 	parent.location.href.includes("liyuan")
-					// ) {
-					// 	let _list = this.allowOrgList.find((i) => i.id == this.org2).list;
-					// 	let _nowOrgId = this.OrgOptions.find((i) => i.Uorg == this.org).id;
-					// 	if (!_list.includes(_nowOrgId)) {
-					// 		this.wechatLogin();
-					// 		await loginOut();
-					// 		await this.logout();
-					// 		return this.$message.error("该组织/学校不允许登录");
-					// 	}
-					// 	window.sessionStorage.setItem("org2", this.org2);
-					// }
-
 					if (this.allowOrgList.findIndex((i) => i.area) != -1) {
 						let _index = this.allowOrgList.findIndex((i) => i.area);
 						let _list = this.allowOrgList[_index].list;