|
@@ -124,7 +124,7 @@
|
|
|
|
|
|
<div
|
|
|
@click="loginType = 'orgL'"
|
|
|
- v-if="['default', 'weChat','orgL'].includes(loginType)"
|
|
|
+ v-if="['default', 'weChat','orgL'].includes(loginType) && (allowOrgList.findIndex((i) => i.area) == -1)"
|
|
|
>
|
|
|
<el-tooltip effect="dark" content="组织号登录" placement="bottom">
|
|
|
<img :src="loginType == 'orgL' ? require('../../assets/login/zzl.svg') :require('../../assets/login/orgh.svg') "
|
|
@@ -494,8 +494,13 @@ export default {
|
|
|
}else{
|
|
|
// // admin走这里
|
|
|
console.log('2222');
|
|
|
- this.$message.error("该账号须使用“组织号登陆”");
|
|
|
- this.loginType = 'orgL'
|
|
|
+ if (this.allowOrgList.findIndex((i) => i.area) != -1) {
|
|
|
+ this.$message.error("请输入账号后缀");
|
|
|
+ }else{
|
|
|
+ this.$message.error("该账号须使用“组织号登陆”");
|
|
|
+ this.loginType = 'orgL'
|
|
|
+ }
|
|
|
+
|
|
|
// let mergedList = this.allowOrgList.reduce((acc, curr) => {
|
|
|
// return [...acc, ...curr.list];
|
|
|
// }, []);
|