Commit 7ef05321 authored by 杨思琦's avatar 杨思琦

fix: 中移免密登录修改

parent d1cb1de9
Pipeline #73715 passed with stages
...@@ -149,6 +149,7 @@ class Login { ...@@ -149,6 +149,7 @@ class Login {
loginName = params.getParams('loginName') ? params.getParams('loginName') : loginName; loginName = params.getParams('loginName') ? params.getParams('loginName') : loginName;
const homepage = params.getParams('homepage'); const homepage = params.getParams('homepage');
const generateType = params.getParams('generateType'); const generateType = params.getParams('generateType');
const authCode = params.getParams('authCode');
if (window.globalConfig.loginTemplate === '广州登录页' && this.props.location.pathname.indexOf('noscret') > -1) { if (window.globalConfig.loginTemplate === '广州登录页' && this.props.location.pathname.indexOf('noscret') > -1) {
self.getIpone().then(v => { self.getIpone().then(v => {
this.gzlogin(v.data.userMobile); this.gzlogin(v.data.userMobile);
...@@ -176,8 +177,8 @@ class Login { ...@@ -176,8 +177,8 @@ class Login {
} else if (ddCode && loginMode === 'qywx') { } else if (ddCode && loginMode === 'qywx') {
// 云平台和信息化都有企业微信,得区分(接口定义里面做了判断) // 云平台和信息化都有企业微信,得区分(接口定义里面做了判断)
self.qywxLoginIn(ddCode); self.qywxLoginIn(ddCode);
} else if (!!loginName && !!password) { } else if ((!!loginName && !!password) || !!authCode) {
self.otherLoginIn(loginName, password); self.otherLoginIn(loginName, password, authCode);
} else if ( } else if (
self.globalConfig.qrcodeData && self.globalConfig.qrcodeData &&
(self.globalConfig.qrcodeData.state && self.globalConfig.qrcodeData.state === this.redirect_state) && (self.globalConfig.qrcodeData.state && self.globalConfig.qrcodeData.state === this.redirect_state) &&
...@@ -763,7 +764,7 @@ class Login { ...@@ -763,7 +764,7 @@ class Login {
}); });
} }
otherLoginIn(usr, pwd) { otherLoginIn(usr, pwd, code) {
// const uesrName = decode(usr.substring(0, usr.length - 3)); // const uesrName = decode(usr.substring(0, usr.length - 3));
// const password = decode(pwd.substring(0, pwd.length - 3)); // const password = decode(pwd.substring(0, pwd.length - 3));
const self = this; const self = this;
...@@ -778,6 +779,7 @@ class Login { ...@@ -778,6 +779,7 @@ class Login {
referer: this.globalConfig.client, referer: this.globalConfig.client,
skipMenuTest: 1, skipMenuTest: 1,
generateType: params.getParams('generateType') || '', generateType: params.getParams('generateType') || '',
authCode: code,
}) })
.then(response => { .then(response => {
// self.globalConfig.layout = 'blank'; // self.globalConfig.layout = 'blank';
......
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