diff --git a/src/App.js b/src/App.js index 999da7318..50a240e5e 100644 --- a/src/App.js +++ b/src/App.js @@ -195,7 +195,7 @@ class App extends Component { let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : ''; pathname && this.getPathnameType(pathname); - const login = cookie.load("login"); + const login = cookie.load("autologin_trustie"); let path = this.props.history.location.pathname; if(login && (path === "/login" || path === "/register" || path === "/resetPassword" || path.indexOf("/bindlogin") >-1 )){ this.props.history.push(`/${login}`); diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx index 4337d83ff..d4e01a2f8 100644 --- a/src/forge/Account/bind.jsx +++ b/src/forge/Account/bind.jsx @@ -25,7 +25,8 @@ function Bind(props){ if(result && result.data.status === 0){ cookie.save("supplyphone",true); cookie.save("login",result.data.login); - window.location.href = "/"+result.data.login; + let gopage = cookie.load("go_page"); + window.location.href = gopage || "/"+result.data.login; }else{ props.showNotification(result.data.message); }