|
|
@@ -5,7 +5,6 @@
|
|
|
v-if="form.basics && form.basics.loginBanner"
|
|
|
:src="form.basics.loginBanner"
|
|
|
/>
|
|
|
- <!-- <img v-if="parent.location.href.includes('lyxx') || parent.location.href.includes('liyuan')" src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/20250421-1139511745206807965.jpg"> -->
|
|
|
<img v-else src="@/assets/login2.jpg" />
|
|
|
</div>
|
|
|
<div class="lp_right">
|
|
|
@@ -167,6 +166,9 @@ export default {
|
|
|
area:
|
|
|
parent.location.href.includes("lyxx") ||
|
|
|
parent.location.href.includes("liyuan"),
|
|
|
+ banner:"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/20250421-1139511745206807965.jpg",
|
|
|
+ logo:"https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/image%2051744962188550.svg",
|
|
|
+ name:"荔园小学教育集团",
|
|
|
list: [
|
|
|
"3823a6a5-1b6e-11f0-a66a-005056924926",
|
|
|
"292e34dc-1b6e-11f0-a66a-005056924926",
|
|
|
@@ -188,6 +190,14 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
},
|
|
|
+ computed:{
|
|
|
+ showLoginMessage(){
|
|
|
+ let _result = {};
|
|
|
+
|
|
|
+
|
|
|
+ return _result;
|
|
|
+ },
|
|
|
+ },
|
|
|
methods: {
|
|
|
...mapActions({
|
|
|
login: "user/login",
|
|
|
@@ -219,7 +229,6 @@ export default {
|
|
|
if (this.allowOrgList.findIndex((i) => i.area) != -1) {
|
|
|
let _index = this.allowOrgList.findIndex((i) => i.area);
|
|
|
let _list = this.allowOrgList[_index].list;
|
|
|
- console.log(this.OrgOptions)
|
|
|
if (this.OrgOptions.find((i) => i.Uorg == this.org) && !_list.includes(this.OrgOptions.find((i) => i.Uorg == this.org).id)
|
|
|
) {
|
|
|
return this.$message.error("该组织/学校不允许登录");
|
|
|
@@ -399,6 +408,19 @@ export default {
|
|
|
if (this.OrgOptions.length == 1) {
|
|
|
this.org = this.OrgOptions[0].Uorg;
|
|
|
} else if (this.OrgOptions.length > 0) {
|
|
|
+ if(this.allowOrgList.findIndex((i) => i.area) != -1){
|
|
|
+ let _index = this.allowOrgList.findIndex((i) => i.area);
|
|
|
+ let _list = this.allowOrgList[_index].list;
|
|
|
+ this.org = this.OrgOptions.filter(i=>_list.includes(i.id))[0].Uorg;
|
|
|
+ }else{
|
|
|
+ let mergedList = this.allowOrgList.reduce((acc, curr) => {
|
|
|
+ return [...acc, ...curr.list];
|
|
|
+ }, []);
|
|
|
+ if(this.OrgOptions.filter(i=>!mergedList.includes(i.id)).length==1){
|
|
|
+ this.org = this.OrgOptions.filter(i=>!mergedList.includes(i.id))[0].Uorg;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
// if (this.OrgOptions.map((i) => i.Uorg).includes("@cocorobo.cc")) {
|
|
|
// this.org = "@cocorobo.cc";
|
|
|
// } else {
|
SanHQin