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

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -9,7 +9,6 @@ import '../css/Courses.css';
 import Modals from "../../modals/Modals";
 import AddStudentModal from '../members/modal/AddStudentModal'
 import AddTeacherModal from '../members/modal/AddTeacherModal'
-import Trialapplication from "../../login/Trialapplication";
 
 // 点击按钮复制功能
 // function jsCopy(){
@@ -44,35 +43,14 @@ class CoursesBanner extends Component {
             modalsBottomval: "",
             antIcon:false,
             coursedata:undefined,
-            user_phone_binded:false,
-            isRenders:false,
-            showTrial:false,
         }
     }
     componentDidMount() {
 
 			this.onloadupdatabanner()
-      try {
-			  if(this.props.current_user!==undefined){
-          this.setState({
-            user_phone_binded :this.props.current_user.user_phone_binded,
-          })
-        }
-      }catch (e) {
-			  console.log("CoursesBanner 60")
-        console.log(e)
-      }
 
     }
-	componentDidUpdate = (prevProps) => {
-		if(prevProps.current_user!=this.props.current_user){
-			if(this.props.current_user!==undefined){
-				this.setState({
-					user_phone_binded :this.props.current_user.user_phone_binded,
-				})
-			}
-		}
-	}
+
 	onloadupdatabanner=()=>{
 		this.updatabanner()
 	}
@@ -82,19 +60,10 @@ class CoursesBanner extends Component {
       axios.get(url).then((result) => {
       	if( result!=undefined){
 					let data = result.data;
-          if(result.data.status === 407){
-            this.setState({
-              isRenders:true,
-              coursedata: data,
-              showTrial:false,
-            })
-          }else{
             this.setState({
               coursedata: data,
-              showTrial:true,
 
             })
-          }
 				}else{
 					this.onloadupdatabanner()
 				}
@@ -352,11 +321,10 @@ class CoursesBanner extends Component {
   }
 
     render() {
-        let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,user_phone_binded} = this.state;
+        let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon} = this.state;
 
         return (
           <div>
-            <Trialapplication  {...this.state} user_phone_binded={user_phone_binded} ></Trialapplication>
 
             {
               coursedata === undefined || coursedata.status===401? <div id="course_info_1309" className="courseHead" style={{height: '206px'}}></div>:<div id="course_info_1309" className="courseHead" style={{height: '206px'}}>

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

@@ -170,6 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
+      user_phone_binded:false,
       showTrial:false,
     }
     console.log("176")
@@ -207,7 +208,29 @@ class NewHeader extends Component {
 
   }
 
-
+  componentDidUpdate = (prevProps) => {
+    // console.log("211");
+    // console.log(prevProps);
+    // console.log(prevProps.user);
+    // console.log(this.props.user);
+    // if(this.props.user !== undefined){
+    //   this.setState({
+    //         user_phone_binded :this.props.user.user_phone_binded,
+    //       })
+    // }
+    // if(prevProps.user!=this.props.user){
+    //   console.log("216")
+    //   console.log(prevProps.user);
+    //   // if(this.props.current_user!==undefined){
+    //   //   this.setState({
+    //   //     user_phone_binded :this.props.current_user.user_phone_binded,
+    //   //   })
+    //   // }
+    // }else {
+    //
+    //
+    // }
+  }
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
       user:newProps.user
@@ -567,6 +590,7 @@ submittojoinclass=(value)=>{
       user,
       isRender,
       isRenders,
+      user_phone_binded,
     }=this.state;
     /*
         用户名称  用户头像url
@@ -588,7 +612,6 @@ submittojoinclass=(value)=>{
     }else {
       activeIndex = true;
     }
-
     // join_course_url: "https://www.educoder.net/courses/join_course_multi_role"
     // join_project_url: "https://www.educoder.net/applied_project/applied_project_info"
     //    rolearr:["",""],
@@ -612,7 +635,7 @@ submittojoinclass=(value)=>{
         {/*      />*/}
         {/*      :""*/}
         {/*}*/}
-
+        <Trialapplication  {...this.state} user_phone_binded={user_phone_binded} ></Trialapplication>
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
           <a href="/">