登录

src/components/passport/accountLogin/index.js

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

src/components/passport/index.js

@@ -65,16 +65,15 @@ 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) {
-            console.log(history);
-            if(history.action === 'POP' && history.length <= 3) { 
-                console.log('push');
+            if(history.action === 'POP' && history.length <= 3) {
                 history.push('/')
             }else  {
-                console.log('go');
-                history.go(-1)
+                const {from} = location.state || {from: {pathname: '/', search: ''}}
+
+                history.replace(from)
             }
         }
     }