Commit 29f9305a by FE

merge new-share and solve conflict

parents 8df346c9 bd76f496
......@@ -65,15 +65,15 @@ class Passport extends Component {
routeWhenUserLoggedIn = () => {
let {history,location} = this.props
let {history, location} = this.props
let {data} = this.props.user
if (data && Object.values(data).filter(item => !!item).length) {
if(history.action === 'POP' && history.length <= 3) {
if(history.action === 'POP' && history.length <= 3) {
history.push('/')
}else {
const {from} = location.state || {from: {pathname: '/', search: ''}}
history.replace(from)
} else {
const { from } = location.state || {from: {pathname: '/', search: ''}};
history.replace(from);
// history.go(-1)
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment