From 2ee80388c69f482509b64d45aa1e7417c929e397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 10:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8Adebugger?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/user/LoginRegisterComponent.js   | 10 ++++++----
 public/react/src/search/SearchPage.js                  |  5 +++--
 public/react/src/search/searchc.css                    |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

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{
 
 
 													<div className="mt20">
-														<span className="ziticor"><i className="fa fa-user ziticor"></i><span>主讲：{item.author_name}</span></span><span className="ml10 ziticor "><span>{item.author_school_name}</span></span>  <span className="ml20 ziticor"><i className="iconfont icon-shixunguanqia ziticor"></i><span>任务:<span className="ml10 ziticor">{item.challenges_count===undefined?0:item.challenges_count}</span></span></span> <span className="ml20 ziticor"><i className="iconfont icon-chengyuan ziticor"></i><span>学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span>
+														<span className="ziticor"><i className="fa fa-user ziticor"></i><span className="ml10">主讲：{item.author_name}</span></span><span className="ml10 ziticor "><span>{item.author_school_name}</span></span>  <span className="ml20 ziticor"><i className="iconfont icon-shixunguanqia ziticor"></i><span>任务:<span className="ml10 ziticor">{item.challenges_count===undefined?0:item.challenges_count}</span></span></span> <span className="ml20 ziticor"><i className="iconfont icon-chengyuan ziticor"></i><span>学习人数:<span className="ml10 ziticor">{item.study_count===undefined?0:item.study_count}</span></span></span>
 													</div>
 
 												</div>
diff --git a/public/react/src/search/searchc.css b/public/react/src/search/searchc.css
index d228a2ba6..c73680ecb 100644
--- a/public/react/src/search/searchc.css
+++ b/public/react/src/search/searchc.css
@@ -125,4 +125,5 @@
 }
 .ziticor{
     color: #777777;
+    font-size: 13px;
 }
\ No newline at end of file