Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

# Conflicts:
#	public/react/src/modules/tpm/NewHeader.js

public/react/src/modules/tpm/NewHeader.js

@@ -432,7 +432,7 @@ class NewHeader extends Component {
     })
   }
 
-  submittojoinclass=(value)=>{
+submittojoinclass=(value)=>{
   let {tojoinclasstitle,rolearr,RadioGroupvalue}=this.state;
 
   if(tojoinclasstitle===undefined){
@@ -561,7 +561,7 @@ class NewHeader extends Component {
       }
     })
   }
-  }
+}
 
   // trialapplications =()=>{
   //   console.log("点击了")

public/react/src/search/SearchPage.js

@@ -52,15 +52,6 @@ class SearchPage extends Component{
 	}
 
 	componentDidMount(){
-		// const query =this.props.location.search;
-		// const type = query.split('?tab=');
-		// let sum = []
-		// sum.push(type[1])
-		// // console.log("componentDidMountcomponentDidMount");
-		// // console.log(sum);
-		// this.setState({
-		// 	tab:sum,
-		// })
 		let courstype=decodeURI(decodeURI(this.props.location.search));
 		courstype = courstype.split('?value=');
 
@@ -70,6 +61,17 @@ class SearchPage extends Component{
 		this.getdata(this.state.page,this.state.type,courstype[1]);
 
 	}
+	componentDidUpdate(prevProps) {
+    if(prevProps.location.search!=this.props.location.search){
+			let courstype=decodeURI(decodeURI(this.props.location.search));
+			courstype = courstype.split('?value=');
+
+			this.setState({
+				keywords:courstype[1]
+			})
+			this.getdata(this.state.page,this.state.type,courstype[1]);
+		}
+	}
 
 	setdatafunsval=(e)=>{
 		this.setState({