diff --git a/src/routes/Login.js b/src/routes/Login.js index 13af99c..c929493 100644 --- a/src/routes/Login.js +++ b/src/routes/Login.js @@ -183,54 +183,51 @@ class LoginPage extends React.Component { toLogin = (requestCode = false) => { const { tokenData, formData } = this.state; const { orgId, username, password, phoneCode } = formData; + // this.props.dispatch({ + // type: "app/getDataByPost", + // url: "BI/BIController/getVersion", + // onComplete: (ret) => { + // if (ret > config.version) { + // window.localStorage.clear(); + // message.success("清除成功,即将重新加载页面", 2, () => { + // setTimeout(() => window.location.reload(true), 500); + // }); + // } else { + // } + // }, + // }); this.props.dispatch({ - type: "app/getDataByPost", - url: "BI/BIController/getVersion", - onComplete: (ret) => { - // if (ret > config.version) { - // window.localStorage.clear(); - // message.success("清除成功,即将重新加载页面", 2, () => { - // setTimeout(() => window.location.reload(true), 500); - // }); - // } else { - - // } - this.props - .dispatch({ - type: "login/toLogin", - payload: { - Parameter1: username, - Parameter2: MD5(password), - Parameter4: orgId, - Parameter5: storage("lacal").getItem("formConfigVersion").val, - Parameter6: requestCode, - Parameter7: phoneCode, - }, - loginPayload: { - username: username, - password: MD5(password), - accessToken: tokenData.access_token, - refreshToken: tokenData.refreshToken, - expiresIn: tokenData.expiresIn, - userid: tokenData.userid, - }, - }) - .then((validRes) => { - if (validRes) { - storage("lacal").setItem("verifyPhoneCode", tokenData.userid); - this.props.dispatch({ - type: "app/getAllEnum", - }); - if (window.navigator.userAgent.indexOf("Windows") < 1) { - window.location.replace(config.guideH5Host); - } else { - this.props.history.push({ pathname: "/home" }); - } - } - }); - + type: "login/toLogin", + payload: { + Parameter1: username, + Parameter2: MD5(password), + Parameter4: orgId, + Parameter5: storage("lacal").getItem("formConfigVersion").val, + Parameter6: requestCode, + Parameter7: phoneCode, }, - }); + loginPayload: { + username: username, + password: MD5(password), + accessToken: tokenData.access_token, + refreshToken: tokenData.refreshToken, + expiresIn: tokenData.expiresIn, + userid: tokenData.userid, + }, + }) + .then((validRes) => { + if (validRes) { + storage("lacal").setItem("verifyPhoneCode", tokenData.userid); + this.props.dispatch({ + type: "app/getAllEnum", + }); + if (window.navigator.userAgent.indexOf("Windows") < 1) { + window.location.replace(config.guideH5Host); + } else { + this.props.history.push({ pathname: "/home" }); + } + } + }); }; preLogin = () => { @@ -336,9 +333,8 @@ class LoginPage extends React.Component { {/* LOGIN */}
@@ -451,9 +447,8 @@ class LoginPage extends React.Component { type="primary" onClick={this.getPhoneCode} className="login-page__login-verifyCode" - >{`${ - checkTime > 0 ? checkTime + "s后" : "" - }再次发送`} + >{`${checkTime > 0 ? checkTime + "s后" : "" + }再次发送`} } placeholder="请输入短信验证码" className="login-page__login-input"