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

public/react/public/index.html

@@ -68,6 +68,8 @@
       <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
 
       <!--<link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">-->
+
+      <!--需要去build js配置-->
       <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
     <style>
         /*<!--去除浏览器点击操作后有蓝色的底块-->*/

public/react/scripts/build.js

@@ -199,6 +199,7 @@ function generateNewIndexJsp() {
         .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         .replace('/css/css_min_all.css', `${cdnHost}/react/build/css/css_min_all.css?v=${newVersion}`)
+			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace('/js/create_kindeditor.js', `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
 
         // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)

public/react/src/App.js

@@ -336,7 +336,7 @@ class App extends Component {
 
 							{/* <Route path="/myshixuns/:shixunId/stages/:stageId" component={Index}/> */}
               {/* 兴趣页面*/}
-              {/*<Route path="/interest" component={Interestpage}/>*/}
+              <Route path="/interest" component={Interestpage}/>
 							<Route path="/comment" component={CommentComponent}/>
 							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
 							<Route path="/test" component={TestIndex}/>

public/react/src/modules/user/Interestpage.js

@@ -24,7 +24,7 @@ class InterestpageComponent extends Component {
 	constructor(props) {
 		super(props)
 		this.state = {
-			gouxuans: 0,
+			gouxuans: "",
 			gouxuans2:0,
 			gouxuans3:[{id:1,name:"前端开发",bool:false,url:qdkf},{id:2,name:"后端开发",bool:false,url:hdkf},{id:3,name:"移动开发",bool:false,url:ydkf},{id:4,name:"数据库",bool:false,url:sjk},{id:5,name:"云计算和大数据",bool:false,url:ysj},{id:6,name:"运维与测试",bool:false,url:yunwei},{id:7,name:"人工智能",bool:false,url:rgzn},{id:8,name:"其他",bool:false,url:qita}],
 			namezh:this.props.namezh,
@@ -35,15 +35,15 @@ class InterestpageComponent extends Component {
     console.log(e);
     if(e === 1){
       this.setState({
-				gouxuans:1,
+				gouxuans:"teacher",
 			})
 		}else if(e === 2){
 			this.setState({
-				gouxuans:2,
+				gouxuans:"student",
 			})
 		}else if(e === 3){
 			this.setState({
-				gouxuans:3,
+				gouxuans:"professional",
 			})
 		}
 	}
@@ -68,6 +68,33 @@ class InterestpageComponent extends Component {
 
 	}
 
+	//兴趣页面点击
+	Interestcompletionpage(){
+		if(this.state.gouxuans.length === 0){
+			this.props.showNotification("请选择您的职业");
+			return
+		}
+		var ints=[];
+		for (var i =0;i<this.state.gouxuans.length;i++) {
+        if(this.state.gouxuans[i].bool === true){
+          ints.push(this.state.gouxuans[i].id);
+				}
+		}
+		var url = "/users/interest.json";
+		axios.post(url, {
+			identity:this.state.gouxuans,
+			interest_ids: ints,
+		}).then((response) => {
+			if (response !== undefined) {
+      this.Jumptotheinterestpage();
+			}
+
+
+		}).catch((error) => {
+			console.log(error);
+
+		})
+	}
 
 	//跳转然后登入
 	Jumptotheinterestpage=()=>{
@@ -94,7 +121,7 @@ class InterestpageComponent extends Component {
 
 
 		}).catch((error) => {
-
+			console.log(error);
 		})
 	}
 	render() {
@@ -111,15 +138,15 @@ class InterestpageComponent extends Component {
 					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
 					<div className="ysldivhome1" >
           <div className="ysldivhomediv" style={{marginLeft:"30px"}} >
-					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(1)}>{gouxuans ===1? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
+					<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}老师</div>
 						<div className="ysldivhomedivimg" ><img src={skzbdx} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" style={{ marginLeft:"101px",marginRight:"101px"}}>
-						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(2)}>{gouxuans===2? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
+						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}学生</div>
 						<div className="ysldivhomedivimg"><img src={mytc} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" >
-						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher(3)}>{gouxuans===3?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
+						<div className="ysldivhomedivtxt" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg"/>:<img className="gouxuanimg" src={meigouxuan}/>}专业人士</div>
 						<div className="ysldivhomedivimg"><img src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
@@ -138,7 +165,7 @@ class InterestpageComponent extends Component {
 								)
 							})}
 					</div>
-					<Button className="yslbutton" size={"large"} type="primary" style={{width:"255px",height: "36px",background: "#4CACFF"}}>完成</Button>
+					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "36px",background: "#4CACFF"} }>完成</Button>
 
 					</div>