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

public/react/src/modules/courses/coursesPublic/HomeworkModal.js

@@ -27,8 +27,6 @@ class HomeworkModal extends Component{
       group_ids:[],
 			endtime:""
     }
-		console.log("30");
-		console.log(props);
   }
 	componentDidMount() {
 

public/react/src/modules/login/Trialapplication.js

@@ -69,6 +69,22 @@ class Trialapplication extends Component {
 			})
 
 		}
+		//  是否不显示手机栏
+			let url = `/users/get_user_info.json`
+			axios.get(url,{params:{
+						school:1
+					}
+				},
+			).then((response) => {
+				   if(response !==undefined){
+				   	   this.setState({
+								 user_phone_binded:response.data.user_phone_binded
+							 })
+					 }
+			}).catch((error) => {
+				console.log(error)
+			})
+
 		axios.interceptors.response.use((response) => {
 			if (response != undefined)
 				if (response && response.data.status === 407) {
@@ -81,18 +97,7 @@ class Trialapplication extends Component {
 			//     //   // TODO 这里如果样式变了会出现css不加载的情况
 		});
 		// console.log("89");
-		try {
-			// console.log(this.state.props.user && this.state.props.user.user_phone_binded);
-			if (this.state.props.user !== undefined) {
-				this.setState({
-					user_phone_binded: this.state.props.user.user_phone_binded,
-				})
-			}
 
-		} catch (e) {
-			console.log(e);
-
-		}
 
 	}
 

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

@@ -173,6 +173,8 @@ class NewHeader extends Component {
       showTrial:false,
       user:undefined,
     }
+    console.log("176")
+    console.log(props);
   }
 
   componentDidMount() {