ask redirect

src/App.js

@@ -58,7 +58,7 @@ class App extends Component {
 
         const routeMatchRule = /binding-tel|forgot|set-password/
         const {history} = this.props
-        history.listen((location, action) => {
+        history.listen((location) => {
             this.setNavigationRecord(location)
             if (cookie.get('uid') && this.props.user.hasError) {
                 this.getUser()
@@ -127,6 +127,10 @@ class App extends Component {
         const {location} = this.props
         this.previousLocation = location.pathname.startsWith('/passport') ?
             this.previousLocation.pathname === '/' ? location : this.previousLocation : location
+
+        if (!this.props.user.hasError && getParam('redirect')) {
+            window.location.href = getParam('redirect')
+        }
     }
 
 

src/components/passport/login/index.js

@@ -28,13 +28,12 @@ class Login extends Component {
         const item = loginWays.find(item => item.text === method)
 
         let from = location.state && location.state.from || {
-            from: {
-                pathname: '/',
-                search: window.location.search,
-                hash: ''
-            }
+            pathname: '/',
+            search: window.location.search,
+            hash: ''
         };
         const redirectURI = window.location.origin + from.pathname + from.search + from.hash;
+
         switch (method) {
             case '账号登录':
                 history.push({pathname: '/passport/account-login', search: window.location.search}, location.state)

src/store/userReducer.js

 import { SET_CURRENT_USER, UPDATE_USER, START_FETCH_USER } from '@/store/userAction';
 import { merge } from 'lodash'
 
+const notLoggedIn = 4030
 
 const initialState = {
-    hasError: false,
-    code: 0,
+    hasError: true,
+    code: notLoggedIn,
     msg: '',
     data: {
         username: '',