login redirect modify

src/components/passport/accountLogin/index.js

@@ -74,14 +74,15 @@ const formikConfig = {
         const {props, props: {history}} = formikBag
         props.accountLogin({
             username, password
-        }).then(res => {
-            if (!res.hasError) {
-                let {from} = props.location.state || {from: {pathname: '/', search: ''}}
-                history.replace({pathname: from.pathname, search: from.search || ''})
-            } else {
-                Toast.info(res.msg, 2, null, false)
-            }
         })
+        // .then(res => {
+        //     if (!res.hasError) {
+        //         let {from} = props.location.state || {from: {pathname: '/', search: ''}}
+        //         history.replace({pathname: from.pathname, search: from.search || ''})
+        //     } else {
+        //         Toast.info(res.msg, 2, null, false)
+        //     }
+        // })
     }
 }
 

src/components/passport/index.js

@@ -65,10 +65,16 @@ class Passport extends Component {
 
 
     routeWhenUserLoggedIn = () => {
-        let {history} = this.props
+        let {history, location} = this.props
         let {data} = this.props.user
         if (data && Object.values(data).filter(item => !!item).length) {
-            (history.action === 'POP' && history.length <= 3) ? history.push('/') : history.go(-1)
+            if(history.action === 'POP' && history.length <= 3)  {
+                history.push('/')
+            } else {
+                const { from } = location.state || {from: {pathname: '/', search: ''}};
+                history.replace(from);
+                // history.go(-1)
+            }
         }
     }