Commit eeceeadc authored by 周宏民's avatar 周宏民

fix: 修改关闭集成登录失效的bug

parent 435f09f9
Pipeline #94473 waiting for manual action with stages
...@@ -381,9 +381,8 @@ class Login { ...@@ -381,9 +381,8 @@ class Login {
}); });
} }
if (!flag && this.isSignIn && !window.qiankunStarted) { if (!flag && this.isSignIn && !window.qiankunStarted) {
const item = guidePage.find(g => g.value === this.globalConfig.displayMode); // 到引导页 熊猫演示环境
// 到引导页 if (this.globalConfig.displayMode === 'demonstration' || this.globalConfig.displayMode === 'panda') {
if (this.globalConfig.displayMode !== 'default' && item) {
this.createContext(this); this.createContext(this);
this.updateConfig && this.updateConfig(this.globalConfig); this.updateConfig && this.updateConfig(this.globalConfig);
this.events && this.events.emit('loginIndustry'); this.events && this.events.emit('loginIndustry');
...@@ -392,6 +391,8 @@ class Login { ...@@ -392,6 +391,8 @@ class Login {
// this.globalConfig.isIntegration 为系统配置表里 是否集成登录 // this.globalConfig.isIntegration 为系统配置表里 是否集成登录
// integratedNum 为当前站点配置的集成登录数量, // integratedNum 为当前站点配置的集成登录数量,
if (this.globalConfig.isIntegration >= 1 && this.integratedNum >= 2) { if (this.globalConfig.isIntegration >= 1 && this.integratedNum >= 2) {
this.createContext(this);
this.updateConfig && this.updateConfig(this.globalConfig);
this.events && this.events.emit('loginIndustry'); this.events && this.events.emit('loginIndustry');
return false; return false;
} }
...@@ -1391,7 +1392,7 @@ class Login { ...@@ -1391,7 +1392,7 @@ class Login {
: '', : '',
type: mode, type: mode,
generateType: params.getParams('generateType') || '', generateType: params.getParams('generateType') || '',
vcode: captcha vcode: captcha,
}) })
.then(res => { .then(res => {
if (res.code === 0) { if (res.code === 0) {
...@@ -1444,7 +1445,6 @@ class Login { ...@@ -1444,7 +1445,6 @@ class Login {
loginName: usr, loginName: usr,
generateType: params.getParams('generateType') || '', generateType: params.getParams('generateType') || '',
vcode: captcha, vcode: captcha,
}) })
.then(response => { .then(response => {
if (response?.msg === '密码过期') { if (response?.msg === '密码过期') {
...@@ -1567,7 +1567,8 @@ class Login { ...@@ -1567,7 +1567,8 @@ class Login {
loginHandlerValidate(user, pwd, userPhone, isRememberPWD, ref, validateCode = '') { loginHandlerValidate(user, pwd, userPhone, isRememberPWD, ref, validateCode = '') {
const self = this; const self = this;
if((this.globalConfig?.isVerification || 0) * 1 === 1) return self.loginValidate(user, pwd, userPhone, isRememberPWD, SERVICE_APP_LOGIN_MODE.password, validateCode); if ((this.globalConfig?.isVerification || 0) * 1 === 1)
return self.loginValidate(user, pwd, userPhone, isRememberPWD, SERVICE_APP_LOGIN_MODE.password, validateCode);
if (user && pwd) { if (user && pwd) {
if (self.loginFailed && self.captchaObj) { if (self.loginFailed && self.captchaObj) {
self.captchaObj.verify(); self.captchaObj.verify();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment