|
|
@ -159,14 +159,14 @@ class Login extends Component { |
|
|
|
else { |
|
|
|
else { |
|
|
|
this.props.history.push({ |
|
|
|
this.props.history.push({ |
|
|
|
pathname: "/dashboard", |
|
|
|
pathname: "/dashboard", |
|
|
|
state: { role_id: role_id, user_id: user_id } |
|
|
|
state: { role_id: role_id, user_id: user_id, token: token, isLogin: true } |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
if (this.state.defaultPage) { |
|
|
|
if (this.state.defaultPage) { |
|
|
|
if (role_id === 44) { |
|
|
|
if (role_id === 44) { |
|
|
|
this.props.history.push({ |
|
|
|
this.props.history.push({ |
|
|
|
pathname: this.state.defaultPage, |
|
|
|
pathname: this.state.defaultPage, |
|
|
|
state: { role_id: role_id, user_id: user_id } |
|
|
|
state: { role_id: role_id, user_id: user_id, token: token, isLogin: true } |
|
|
|
}); |
|
|
|
}); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.props.history.push(this.state.defaultPage); |
|
|
|
this.props.history.push(this.state.defaultPage); |
|
|
@ -177,7 +177,7 @@ class Login extends Component { |
|
|
|
else { |
|
|
|
else { |
|
|
|
this.props.history.push({ |
|
|
|
this.props.history.push({ |
|
|
|
pathname: "/dashboard", |
|
|
|
pathname: "/dashboard", |
|
|
|
state: { role_id: role_id, user_id: user_id } |
|
|
|
state: { role_id: role_id, user_id: user_id, token: token, isLogin: true } |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|