SanHQin 3 months ago
parent
commit
697744a008

File diff suppressed because it is too large
+ 0 - 0
dist/css/app.1d1650d8.css


+ 0 - 0
dist/img/wechat.d3d8349b.svg → dist/img/wechat.0277f1a9.svg


+ 1 - 1
dist/index.html

@@ -36,7 +36,7 @@
         width: 100%;
         background: #e6eaf0;
         font-family: '黑体';
-      }</style><script defer="defer" src="/js/chunk-vendors.fba309d8.js"></script><script defer="defer" src="/js/app.fafd7a1e.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.f5d52c90.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
+      }</style><script defer="defer" src="/js/chunk-vendors.1e67db9e.js"></script><script defer="defer" src="/js/app.5c985cfd.js"></script><link href="/css/chunk-vendors.7cfe4581.css" rel="stylesheet"><link href="/css/app.1d1650d8.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but pblAdminTable doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/js/app.5c985cfd.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.5c985cfd.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.fafd7a1e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.fafd7a1e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.1e67db9e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.1e67db9e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/js/chunk-vendors.fba309d8.js.map


+ 15 - 1
src/views/login/loginPage.vue

@@ -160,6 +160,9 @@ export default {
 			showName: "",
 			oloading: false,
 			openid: "",
+			allowOrgList:[
+				{id:"3823a6a5-1b6e-11f0-a66a-005056924926",list:['3823a6a5-1b6e-11f0-a66a-005056924926','292e34dc-1b6e-11f0-a66a-005056924926','21d6b367-1b6e-11f0-a66a-005056924926','1a1a172d-1b6e-11f0-a66a-005056924926','1197f86b-1b6e-11f0-a66a-005056924926','f235659b-1b6d-11f0-a66a-005056924926','d87b62d3-1b6d-11f0-a66a-005056924926','c25ea59b-1b6d-11f0-a66a-005056924926']}
+			],
 		};
 	},
 	watch: {
@@ -174,6 +177,9 @@ export default {
 			login: "user/login",
 		}),
 		async loginFn() {
+
+			
+
 			if (this.loading) return;
 
 			if (this.account.length <= 0) {
@@ -186,6 +192,14 @@ export default {
 				return;
 			}
 
+			if(this.allowOrgList.find(i=>i.id == this.org2)){
+				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)){
+					return this.$message.error("该组织/学校不允许登录");
+				}
+			}
+
 			let orgValue = this.org ? "@" + this.org : "@cocorobo.cc";
 			let email = "";
 			const regEmail = new RegExp(
@@ -336,7 +350,7 @@ export default {
 					let data = res.data[0];
 					console.log("data", data);
 					this.form = JSON.parse(data[0].json);
-					this.showName = data[0].name;
+					this.showName = this.form.basics.title || data[0].name;
 				})
 				.catch((err) => {
 					console.error("请求失败,错误信息:", err);

Some files were not shown because too many files changed in this diff