diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index 7f8d40c65..71b048edb 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -214,10 +214,7 @@ class LoginRegisterComponent extends Component { if (response === undefined) { return } - if(response.data.identity === null || response.data.identity === undefined){ - this.props.history.push("/interesse"); - return; - } + if(response.data.status === -2){ if("该手机号尚未注册" || "该邮箱尚未注册"){ this.setState({ @@ -246,6 +243,11 @@ class LoginRegisterComponent extends Component { } + if(response.data.identity === null || response.data.identity === undefined){ + this.props.history.push("/interesse"); + return; + } + if (response.status === 200) { if (response.data.status === 402) { window.location.href = response.data.url; diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js index f05e6df5e..990700983 100644 --- a/public/react/src/search/SearchPage.js +++ b/public/react/src/search/SearchPage.js @@ -45,7 +45,8 @@ class SearchPage extends Component{ } this.setState({ tab:e.key, - type:types + type:types, + page:1, }) this.getdata(1,types,this.state.keywords); } @@ -228,7 +229,7 @@ class SearchPage extends Component{