|
|
@ -55,7 +55,7 @@ class AccountPage extends Component {
|
|
|
|
axios.get(url).then((result)=>{
|
|
|
|
axios.get(url).then((result)=>{
|
|
|
|
if(result.data){
|
|
|
|
if(result.data){
|
|
|
|
if(result.data && result.data.base_info_completed == false){
|
|
|
|
if(result.data && result.data.base_info_completed == false){
|
|
|
|
this.props.history.push(`/profile/basic/edit`);
|
|
|
|
this.props.history.push(`/account/profile/edit`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.setState({
|
|
|
|
this.setState({
|
|
|
|
basicInfo: Object.assign({}, {...result.data}, { avatar_url: `${result.data.avatar_url}?t=${new Date().getTime()}`})
|
|
|
|
basicInfo: Object.assign({}, {...result.data}, { avatar_url: `${result.data.avatar_url}?t=${new Date().getTime()}`})
|
|
|
@ -79,30 +79,30 @@ class AccountPage extends Component {
|
|
|
|
<AccountNav {...this.props} {...common}></AccountNav>
|
|
|
|
<AccountNav {...this.props} {...common}></AccountNav>
|
|
|
|
<div className="basicFormWrap">
|
|
|
|
<div className="basicFormWrap">
|
|
|
|
<Switch {...this.props}>
|
|
|
|
<Switch {...this.props}>
|
|
|
|
<Route exact path="/profile/basic"
|
|
|
|
<Route exact path="/account/profile"
|
|
|
|
render={
|
|
|
|
render={
|
|
|
|
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
></Route>
|
|
|
|
></Route>
|
|
|
|
<Route exact path="/profile/basic/edit"
|
|
|
|
<Route exact path="/account/profile/edit"
|
|
|
|
render={
|
|
|
|
render={
|
|
|
|
(props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
(props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
></Route>
|
|
|
|
></Route>
|
|
|
|
|
|
|
|
|
|
|
|
<Route exact path="/profile/certification"
|
|
|
|
<Route exact path="/account/certification"
|
|
|
|
render={
|
|
|
|
render={
|
|
|
|
(props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
(props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
></Route>
|
|
|
|
></Route>
|
|
|
|
|
|
|
|
|
|
|
|
<Route exact path="/profile/secure"
|
|
|
|
<Route exact path="/account/secure"
|
|
|
|
render={
|
|
|
|
render={
|
|
|
|
(props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
(props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
></Route>
|
|
|
|
></Route>
|
|
|
|
|
|
|
|
|
|
|
|
<Route exact path="/profile"
|
|
|
|
<Route exact path="/account"
|
|
|
|
render={
|
|
|
|
render={
|
|
|
|
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
|
|
|
|
}
|
|
|
|
}
|
|
|
|