diff --git a/public/react/src/App.js b/public/react/src/App.js
index 1a1af02d9..15105f749 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -207,6 +207,12 @@ const UsersInfo = Loadable({
 	loading: Loading,
 })
 
+// 兴趣页面
+const Interestpage = Loadable({
+	loader: () => import('./modules/user/Interestpage'),
+	loading: Loading,
+})
+
 class App extends Component {
 	constructor(props) {
 		super(props)
@@ -324,8 +330,8 @@ class App extends Component {
           </Route> */}
 
 							{/* <Route path="/myshixuns/:shixunId/stages/:stageId" component={Index}/> */}
-
-
+              {/* 兴趣页面*/}
+              {/*<Route path="/interest" component={Interestpage}/>*/}
 							<Route path="/comment" component={CommentComponent}/>
 							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
 							<Route path="/test" component={TestIndex}/>
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 060b8b482..be6b7e5eb 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -95,6 +95,12 @@ class PollNew extends Component {
 	// 初始化数据
 	componentDidMount = () => {
 		// console.log("componentDidMount 50")
+		if(	this.props.isStudent() === true){
+
+			 this.props.history.push("/403")
+
+			return
+		}
 		if (this.props.match.params.news !== undefined) {
 			if (this.props.match.params.news === "new") {
 				this.state.Newedit === true;
@@ -780,19 +786,21 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 3) {
-			if (object.question.question_type === 1) {
-				this.props.showNotification(`选项不能少于3个!`);
 
+			if (object.question.question_type === 1) {
+				if (maxtie < 2) {
+				this.props.showNotification(`选项不能少于2个!`);
 				return
+				}
 			} else if (object.question.question_type === 2) {
+				if (maxtie < 3) {
 				this.props.showNotification(`选项不能少于3个!`);
-
 				return
+				}
 			}
 
 
-		}
+
 
 		if (object.question.question_type === 2) {
 			if (object.question.max_choices > 0) {
@@ -1260,17 +1268,19 @@ class PollNew extends Component {
 			}
 
 		}
-		if (maxtie < 3) {
 			if (object.question.question_type === 1) {
-				this.props.showNotification('选项不能少于3个!');
+				if (maxtie < 2) {
+					this.props.showNotification('选项不能少于2个!');
 				return
+				}
 			} else if (object.question.question_type === 2) {
+				if (maxtie < 3) {
 				this.props.showNotification('选项不能少于3个!');
 				return
+				}
 			}
 
 
-		}
 
 		if (object.question.question_type === 2) {
 			if (object.question.max_choices > 0) {
@@ -2496,7 +2506,7 @@ class PollNew extends Component {
 									(<RadioGroup defaultChecked={false} disabled>
 										{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 											return (
-												<div className={"h20 mt20 mb20 "} style={{"clear": "both"}}>
+												<div className="h20 pt20" style={{"clear": "both"}}>
 													<Radio value={i} className={"fl"} style={{"text-align": "left"}}></Radio>
 													{/*<pre className={"break_word flex1 fl"}*/}
 													{/*		 style={{"text-align": "left"}}>{items.answer_text}</pre>*/}
@@ -2511,7 +2521,7 @@ class PollNew extends Component {
 										(<CheckboxGroup defaultChecked={false} disabled>
 											{item.question.answers === undefined ? "" : item.question.answers.map((items, i) => {
 												return (
-													<div className="mt10 mt20 mb20 " style={{"clear": "both"}}>
+													<div className="mt10 pt20 " style={{"clear": "both"}}>
 														<Checkbox value={i} className={"fl"} style={{"text-align": "left"}}></Checkbox>
 														<span className={" flex1"} style={{"text-align": "left","white-space":"pre-wrap","word-break": "break-all","word-wrap": "break-word","float": "left","width":"1120px"}}>{items.answer_text}</span>
 
diff --git a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
index 405490f38..472d76d2c 100644
--- a/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
+++ b/public/react/src/modules/courses/shixunHomework/Homeworddescription.js
@@ -41,7 +41,7 @@ class Homeworddescription extends Component {
         super(props);
         this.state = {
             props: props,
-            description:undefined,
+            description:props.description,
         }
 
 
@@ -74,10 +74,8 @@ class Homeworddescription extends Component {
             <div >
                 <div  style={{
                     "background-color":"#FFFFff",
-                    "margin-top":"20px",
                     "padding":"20px 20px",
                     "position": "relative",
-                    "border-bottom": "1px solid #EDEDED",
                     "margin-bottom":" 0px"}}>
                     <style>
                         {`
@@ -85,7 +83,8 @@ class Homeworddescription extends Component {
                   `}
                     </style>
                     <Form.Item
-                        label="作业说明"
+                        label=""
+                        className="mdInForm"
                     >
                         {/*<TextArea  placeholder="作业说明..." value={this.state.description} onInput={this.settextarea} style={{"height": "120px"}}/>*/}
                             {/*<TextArea style={{"height": "120px"}}*/}
@@ -93,7 +92,7 @@ class Homeworddescription extends Component {
                         <TPMMDEditor ref={this.mdRef} placeholder={'作业说明'}
                                      mdID={'courseMessageMD'} initValue={this.state.description}   className="courseMessageMD" onChange={this.settextarea} style={{"height": "120px"}}></TPMMDEditor>
                     </Form.Item>
-                    <div className="clearfix">
+                    <div className="clearfix mt10">
                             <Button  type="primary" className="defalutSubmitbtn  fr mr20 "style={{"width":"90px"}} onClick={this.onSaveExercise} >保存</Button>
                             <Button className="defalutCancelbtn fr mr20 w20"  style={{"width":"90px"}} onClick={this.clickcancel} >取消</Button>
                     </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 056414904..715ffb7e8 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -15,7 +15,7 @@ class ShixunWorkModal extends Component{
 	}
 	componentDidMount() {
 		let {group_list}=this.state;
-   let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
+		let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
 		axios.get(url,{params:{
 				limit:10,
 				page:1,
@@ -49,7 +49,7 @@ class ShixunWorkModal extends Component{
 
 	//勾选实训
 	shixunhomeworkedit=(checkedValues)=>{
-    let types=false
+		let types=false
 		let{group_list}=this.state;
 		group_list.map((item,key)=>{
 			if(item!=undefined){
@@ -87,7 +87,6 @@ class ShixunWorkModal extends Component{
 			let {page,limit,group_list}=this.state;
 			let newpage=page+1;
 			let newgroup_list=group_list;
-			debugger
 			let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
 
 			axios.get(url,{params:{
@@ -133,30 +132,30 @@ class ShixunWorkModal extends Component{
 
 		let {data}=this.props;
 		if(e.target.checked===true){
-      if(data&&data.length===0){
+			if(data&&data.length===0){
 				let id=[]
 				group_list.forEach((item,key)=>{
 					id.push(item.id)
 				})
-	      this.setState({
-		      group_ids:id,
-		      onChangetype:e.target.checked
-	      })
-      }else{
-      	let id=[]
-		  group_list.forEach((item,key)=>{
-		      id.push(item.id)
-	      })
-	      this.setState({
-		      group_ids:id,
-		      onChangetype:e.target.checked
-	      })
-      }
-		}else{
 				this.setState({
-					group_ids:[],
+					group_ids:id,
 					onChangetype:e.target.checked
 				})
+			}else{
+				let id=[]
+				group_list.forEach((item,key)=>{
+					id.push(item.id)
+				})
+				this.setState({
+					group_ids:id,
+					onChangetype:e.target.checked
+				})
+			}
+		}else{
+			this.setState({
+				group_ids:[],
+				onChangetype:e.target.checked
+			})
 		}
 
 	}
@@ -186,7 +185,7 @@ class ShixunWorkModal extends Component{
 						message:"提示",
 						description: response.data.message
 					});
-         console.log(this.props)
+					console.log(this.props)
 				}else if(response.data.status === -1){
 					notification.open({
 						message:"提示",
@@ -221,7 +220,7 @@ class ShixunWorkModal extends Component{
 	render(){
 		let {course_groups,group_ids,onChangetype,group_list}=this.state;
 		// let {data}=this.props;
-    // console.log(group_list)
+		// console.log(group_list)
 		// console.log(course_groups)
 		return(
 			<div>
@@ -250,59 +249,59 @@ class ShixunWorkModal extends Component{
 
 						{course_groups===undefined?"":
 							<ul className="upload_select_box fl clearfix mt10 mb10" tyle={{"overflow-y":"auto"}}id="search_not_members_list"
-				      onScroll={this.contentViewScroll}
-						  >
-
-
-						 <Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit} value={group_ids}>
-								{
-									group_list===undefined?course_groups.ungroup_list.work_count===0?"":
-
-										  <div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
-											  <li className="fl task-hide" style={{width: '240px'}}>
-												  <Checkbox
-													  className="fl task-hide edu-txt-left"
-													  name="shixun_homework[]"
-													  value={course_groups.ungroup_list.id}
-												  >
-													  <label style={{"textAlign": "left", "color": "#05101A"}}
-													         className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
-												  </Checkbox>
-											  </li>
-											  <li className="fl" style={{width: '100px'}}>
-												  {course_groups.ungroup_list.work_count}
-											  </li>
-											  <li className="fl" style={{width: '160px'}}>
-												  {course_groups.ungroup_list.last_review_time}
-											  </li>
-										  </div>
-
-									  :
-									  group_list&&group_list.map((item,key)=>{
-									   	return(
-												item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
-											    <li className="fl task-hide" style={{width: '240px'}}>
-												    <Checkbox
-													    className="fl task-hide edu-txt-left"
-													    name="shixun_homework[]"
-													    value={item=== undefined?"":item.id}
-												    >
-													    <label style={{"textAlign": "left", "color": "#05101A"}}
-													           className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
-												    </Checkbox>
-											    </li>
-											    <li className="fl" style={{width: '100px'}}>
-												    {item===undefined?"":item.works_count===undefined?item.work_count:item.works_count}
-											    </li>
-											    <li className="fl" style={{width: '160px'}}>
-												    {item===undefined?"":item.last_review_time}
-											    </li>
-										    </div>
+									onScroll={this.contentViewScroll}
+							>
+
+
+								<Checkbox.Group style={{ width: '100%' }}  onChange={this.shixunhomeworkedit} value={group_ids}>
+									{
+										group_list===undefined?course_groups.ungroup_list.work_count===0?"":
+
+											<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE">
+												<li className="fl task-hide" style={{width: '240px'}}>
+													<Checkbox
+														className="fl task-hide edu-txt-left"
+														name="shixun_homework[]"
+														value={course_groups.ungroup_list.id}
+													>
+														<label style={{"textAlign": "left", "color": "#05101A"}}
+																	 className="task-hide color-grey-name" title="frerere">{course_groups.ungroup_list.name}</label>
+													</Checkbox>
+												</li>
+												<li className="fl" style={{width: '100px'}}>
+													{course_groups.ungroup_list.work_count}
+												</li>
+												<li className="fl" style={{width: '160px'}}>
+													{course_groups.ungroup_list.last_review_time}
+												</li>
+											</div>
+
+											:
+											group_list&&group_list.map((item,key)=>{
+												return(
+													item.work_count===0?"":<div className="clearfix edu-txt-center lineh-40 bor-bottom-greyE" key={key}>
+														<li className="fl task-hide" style={{width: '240px'}}>
+															<Checkbox
+																className="fl task-hide edu-txt-left"
+																name="shixun_homework[]"
+																value={item=== undefined?"":item.id}
+															>
+																<label style={{"textAlign": "left", "color": "#05101A"}}
+																			 className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
+															</Checkbox>
+														</li>
+														<li className="fl" style={{width: '100px'}}>
+															{item===undefined?"":item.works_count===undefined?item.work_count:item.works_count}
+														</li>
+														<li className="fl" style={{width: '160px'}}>
+															{item===undefined?"":item.last_review_time}
+														</li>
+													</div>
 												)
 											})
-								}
-							</Checkbox.Group>
-						</ul>
+									}
+								</Checkbox.Group>
+							</ul>
 						}
 						<div className={"clearfix"}>
 							<Checkbox checked={onChangetype} onChange={this.onChange} className={"ml10"}>{onChangetype===true?"清除":"全选"}</Checkbox>
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 46fda3e10..922496d69 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -467,19 +467,31 @@ class Workquestionandanswer extends Component {
                             <div className="font-16 color-green fl pl20 mt10">作业说明:</div>
                             {
                                 this.props.isAdmin()&&this.props.isAdmin()===true ?
+
+                                  (Showupdateinstructions&& Showupdateinstructions === true?"":
                                     <Tooltip placement="top" title="编辑"><i
-                                        className="color-green font-18 iconfont icon-bianjidaibeijing fr pr20 " onClick={()=>this.jobdescriptiondisplaybj()} ></i></Tooltip>
-                                    :""
+                                      className="color-green font-18 iconfont icon-bianjidaibeijing fr pr20 " onClick={()=>this.jobdescriptiondisplaybj()} ></i></Tooltip>
+                                    ):""
                             }
 
                         </div>
 
                         <span>
-                       <div className="font-16 color-dark   break_word flex1 pl20  "  style={{"padding":"10px 10px 10px 20px"}}>
-                       {jobsettingsdata === undefined ? "无" : jobsettingsdata === null ? "无" : jobsettingsdata === "null" ? "无" :
-                         jobsettingsdata.data.explanation=== undefined?"无" :jobsettingsdata.data.explanation=== null?"无":
-                         <div dangerouslySetInnerHTML={{__html:markdownToHTML(jobsettingsdata.data.explanation).replace(/▁/g,"▁▁▁")}}></div>
-                       }
+                       <div className="font-16 color-dark   break_word flex1  " >
+                            {  Showupdateinstructions&& Showupdateinstructions === true?
+                              <div >
+                                  <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} description={jobsettingsdata === undefined ?"":jobsettingsdata === null ?"":jobsettingsdata === "null"?"":  jobsettingsdata.data.explanation=== undefined?"":jobsettingsdata.data.explanation=== null?"":jobsettingsdata.data.explanation} ></Homeworddescription>
+                              </div>
+                              :
+                              <div className="pl20 " style={{"padding":"10px 10px 10px 20px"}}>
+                                  {jobsettingsdata === undefined ? "无" : jobsettingsdata === null ? "无" : jobsettingsdata === "null" ? "无" :
+                                    jobsettingsdata.data.explanation=== undefined?"无" :jobsettingsdata.data.explanation=== null?"无":
+                                      <div dangerouslySetInnerHTML={{__html:markdownToHTML(jobsettingsdata.data.explanation).replace(/▁/g,"▁▁▁")}}></div>
+                                  }
+
+                              </div>
+                            }
+
                         </div>
                       </span>
                     </div>
@@ -494,12 +506,12 @@ class Workquestionandanswer extends Component {
                     {/* <div className="edu-back-white mb20  graduateTopic course-message"> */}
                         {/*<GraduateTopicReply memo={{id: graduation_topic_id, user_id: topicInfo && topicInfo.user_id}} course_id={course_id} {...this.props}></GraduateTopicReply>*/}
                     {/* </div> */}
-                    {  Showupdateinstructions&& Showupdateinstructions === true?
-                      <div >
-                          <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} ></Homeworddescription>
-                      </div>
-                      :""
-                    }
+                    {/*{  Showupdateinstructions&& Showupdateinstructions === true?*/}
+                    {/*  <div >*/}
+                    {/*      <Homeworddescription {...this.props} ReleaseNotes={this.ReleaseNotes} NOReleaseNotes ={this.NOReleaseNotes} ></Homeworddescription>*/}
+                    {/*  </div>*/}
+                    {/*  :""*/}
+                    {/*}*/}
                     { homework_id && <CommonReply
                         memo={{
                             id: homework_id,
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index f084dec66..7c6dcbe9e 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -25,6 +25,7 @@ import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
 import educodernet from '../../../src/images/login/educodernet.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
+import InterestpageComponent from '../user/Interestpage'
 import FindPasswordComponent from '../user/FindPasswordComponent';
 import passopen from "../../images/login/passopen.png";
 //educoder登入页面
@@ -59,26 +60,26 @@ class EducoderLogin extends Component {
         super(props);
         if(  props.match.url === "/changepassword" ){
             this.state = {
-                showbool: false,
+                showbool: 3,
                 logini:3,
             }
         }else {
             if(props.match.url === "/login"){
                 this.state = {
-                    showbool: true,
+                    showbool: 1,
                     loginstatus:true,
                     logini:1,
 
                 }
             }else if(props.match.url === "/register"){
                 this.state = {
-                    showbool: true,
+                    showbool: 1,
                     loginstatus:false,
                     logini:2,
                 }
             }else{
                 this.state = {
-                    showbool: true,
+                    showbool: 1,
                     logini:1,
 
                 }
@@ -100,16 +101,18 @@ class EducoderLogin extends Component {
         })
 
     }
-    Setshowbool = () => {
-
-        if (this.state.showbool === true) {
+    Setshowbool = (e) => {
+        if (e===1) {
             this.setState({
-                showbool: false
+                showbool: 1
             })
-
-        } else {
+        } else if(e===2) {
+            this.setState({
+                showbool: 2
+            })
+        }else if(e===3){
             this.setState({
-                showbool: true
+                showbool: 3
             })
         }
     }
@@ -135,43 +138,53 @@ class EducoderLogin extends Component {
                         "align-items": "center",
                         "width": "100%"
                     }}>
-                        <div style={{"margin-top": "50px"}}>
+                        <div style={{"margin-top": "20px"}}>
                             <img src={educodernet}/>
                         </div>
 
 
                     </div>
                     {
-                        showbool === true ?
+                        showbool === 1 ?
                             <div style={{
                                 "display": "flex",
                                 "justify-content": "center",
                                 "align-items": "center",
                                 "width": "100%",
                             }}>
-                                <div style={{"margin-top": "40px","height":"530px"}}>
+                                <div style={{"margin-top": "40px","height":"580px"}}>
+
                                     <LoginRegisterComponent {...this.props} {...this.state}
-                                                            Setshowbool={this.Setshowbool} ></LoginRegisterComponent>
+                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
 
                                 </div>
 
                             </div>
-                            :
-                            <div style={{
-                                "display": "flex",
-                                "justify-content": "center",
-                                "align-items": "center",
-                                "width": "100%",
-                            }}>
-                                <div style={{"margin-top": "40px","height":"530px"}}>
-                                    <FindPasswordComponent {...this.props} {...this.state}
-                                                           Setshowbool={this.Setshowbool}></FindPasswordComponent>
-
-                                </div>
-                            </div>
-
+                        :showbool === 2 ?
+                          <div style={{
+                              "display": "flex",
+                              "justify-content": "center",
+                              "align-items": "center",
+                              "width": "100%",
+                          }}>
+                              <InterestpageComponent {...this.props} {...this.state}>
+                              </InterestpageComponent>
+                          </div>
+                        :
+                          <div style={{
+                              "display": "flex",
+                              "justify-content": "center",
+                              "align-items": "center",
+                              "width": "100%",
+                          }}>
+                              <div style={{"margin-top": "40px","height":"580px"}}>
+                                  <FindPasswordComponent {...this.props} {...this.state}
+                                                         Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
+
+                              </div>
+                          </div>
                     }
-                    <div style={{"height":"180px",
+                    <div style={{"height":"125px",
                         "display": "flex",
                         "justify-content": "center",
                         "align-items": "center",
@@ -179,6 +192,7 @@ class EducoderLogin extends Component {
                     }}>
                         <div className="font-14 color-grey-9 " style={{marginTop:"15px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                     </div>
+                    <div style={{"height":"55px"}}></div>
                 </div>
             </div>
         )
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 3f5b9ee0e..c5b72946e 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -756,6 +756,8 @@ submittojoinclass=(value)=>{
                 <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.account_manager_url}>账号管理</a></li>
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
                 {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
+                {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
+
                 <li className="bor-top-greyE">
                   {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.logout_url}>退出</a>*/}
                   {/*<a  onClick={()=>this.educoderlogin()}>退出</a>*/}
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index e7380c12f..393dbc023 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -44,7 +44,7 @@ class LoginRegisterComponent extends Component {
 		});
 	};
 	StudyMakeMoney = () => { // 调用父组件方法
-		this.props.Setshowbool();
+		this.props.Setshowbool(1);
 
 	}
 
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
new file mode 100644
index 000000000..0d01ab563
--- /dev/null
+++ b/public/react/src/modules/user/Interestpage.js
@@ -0,0 +1,116 @@
+import React, {Component} from 'react';
+
+
+import {Button} from 'antd';
+import axios from 'axios';
+import './common.css'
+import mytc from './img/mytc.png';
+import skzbdx from './img/skzbdx.png';
+import zyrs1 from './img/zyrs1.png';
+import gouxuan from './img/gouxuan.png';
+import meigouxuan from './img/meigouxuan.png';
+import qdkf from './img/qdkf.png';
+import hdkf from './img/hdkf.png';
+import ydkf from './img/ydkf.png';
+import sjk from './img/sjk.png';
+import ysj from './img/ysj.png';
+import yunwei from './img/yunwei.png';
+import rgzn from './img/rgzn.png';
+import qita from './img/qita.png';
+//父组件 EducoderLogin.js
+class InterestpageComponent extends Component {
+	constructor(props) {
+		super(props)
+		this.state = {
+			gouxuans: 0,
+			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}],
+		}
+	}
+	Clickteacher=(e)=>{
+    console.log(e);
+    if(e === 1){
+      this.setState({
+				gouxuans:1,
+			})
+		}else if(e === 2){
+			this.setState({
+				gouxuans:2,
+			})
+		}else if(e === 3){
+			this.setState({
+				gouxuans:3,
+			})
+		}
+	}
+	Clickteacher2=(e)=>{
+		console.log(e);
+		let {gouxuans3} =this.state;
+    for (var i=0;i<gouxuans3.length;i++){
+    	if(gouxuans3[i].id === e){
+    		console.log("51");
+    		console.log(e);
+    		if(gouxuans3[i].bool === true){
+					gouxuans3[i].bool=false;
+				}else{
+					gouxuans3[i].bool=true;
+				}
+			}
+		}
+    console.log(gouxuans3);
+    this.setState({
+			gouxuans3:gouxuans3,
+		})
+
+	}
+	render() {
+		const {
+			gouxuans,
+			gouxuans3
+		} = this.state
+		// height: 346px;
+		return (
+
+			<div className="ysllogin_register_contents" style={{width:"800px",height: "620px"}}>
+
+				<div className="ysllogin_section">
+					<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="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="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="ysldivhomedivimg"><img src={zyrs1} className="ysldivhomedivimg"/></div>
+          </div>
+					</div>
+					<div className="mt5"><span className="yslspans2">选择你可能感兴趣的内容</span></div>
+
+					<div ><span className="yslspans3">基于你关注的内容推荐</span></div>
+					<div className="ysldivhome2">
+
+					{gouxuans3&&gouxuans3.map((item,key)=>{
+								return(
+								<div className={item.id<5?"ysldivhomediv1":"ysldivhomediv2"} onClick={()=>this.Clickteacher2(item.id)}>
+								{item.bool===true?<img src={gouxuan} className="yslgouxuanimg"/>:<div className="yslgouxuanimg2"></div>}
+								<img className="div1img" src={item.url}/>
+								<span className="textall">{item.name}</span>
+								</div>
+								)
+							})}
+					</div>
+					<Button className="yslbutton" size={"large"} type="primary" style={{width:"255px",height: "36px",background: "#4CACFF"}}>完成</Button>
+
+					</div>
+
+			</div>
+		);
+	}
+}
+
+export default (InterestpageComponent);
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index c5a2175a9..9d7790ee1 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -138,7 +138,7 @@ class LoginRegisterComponent extends Component {
 
     ;
     StudyMakeMoney = () => { // 调用父组件方法
-        this.props.Setshowbool();
+        this.props.Setshowbool(3);
         // this.props.Setlogins(3);
         this.setState({
             login: "",
@@ -344,7 +344,8 @@ class LoginRegisterComponent extends Component {
                     passwords: "",
                     Agreetotheterms: "",
                 })
-                this.props.history.push(result.data.redirect_uri)
+                // this.props.history.push(result.data.redirect_uri)
+                this.props.Setshowbool(2);
 
             } catch (e) {
 
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 762738f70..d60f59ef0 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -46,4 +46,120 @@
   }
   .dragValidator {
     margin-bottom: 16px;
-  }
\ No newline at end of file
+  }
+  .ysldivhome1{
+    display: flex;
+    flex-direction: row;
+    margin-left: 100px;
+    margin-right: 129px;
+    margin-top: 10px;
+  }
+  .ysldivhome2{
+    display: flex;
+    flex-flow: row wrap;
+    align-content:stretch;
+    margin-top: 10px;
+  }
+  .ysldivhomediv{
+    width: 101px;
+    height: 147px;
+
+  }
+  .ysldivhomediv1{
+    width: 110px;
+    height: 110px;
+    border-radius:50%;
+    box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+    background: #fff;
+    display: flex;
+    flex-direction:column;
+    margin-left: 73px;
+    margin-top: 15px;
+  }
+.ysldivhomediv2{
+  width: 110px;
+  height: 110px;
+  border-radius:50%;
+  box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+  background: #fff;
+  display: flex;
+  flex-direction:column;
+  margin-left: 73px;
+  margin-top: 20px;
+}
+  .ysldivhomedivtxt{
+    width:101px;
+    height:27px;
+    margin-bottom: 10px;
+    font-size: 14px;
+    text-align: center;
+
+  }
+  .ysldivhomedivimg{
+    width: 101px;
+    height: 101px;
+  }
+  .ysllogin_register_contents{
+    display: flex;
+    margin-top: 30px;
+    justify-content: center;
+    box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+    border-radius:6px;
+    background: #fff;
+  }
+  .ysllogin_section {
+    width:800px;
+    height: 620px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+  }
+  .yslspans1{
+    text-align: center;
+    font-size: 16px;
+    color: #111C24;
+  }
+  .yslspans2{
+    text-align: center;
+    font-size: 15px;
+    color: #05101A;
+  }
+  .yslspans3{
+    text-align: center;
+    font-size: 13px;
+    color: #656565;
+  }
+  .yslbutton{
+    width:255px;
+    height: 36px;
+    margin-top:30px;
+    margin-bottom: 19px;
+  }
+  .mt22{
+    margin-top: 22px;
+  }
+  .gouxuanimg{
+    margin-right: 10px;
+    margin-bottom: 2px;
+  }
+  .textall{
+    text-align: center;
+    font-size: 13px;
+    color: #4B4B4B;
+  }
+  .div1img{
+    display: flex;
+    justify-content:center;
+    width: 60px;
+    margin-left: 27px;
+
+  }
+.yslgouxuanimg{
+  width: 20px;
+  height: 20px;
+  margin-left: 75px;
+
+}
+.yslgouxuanimg2{
+  height: 20px;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/user/img/gouxuan.png b/public/react/src/modules/user/img/gouxuan.png
new file mode 100644
index 000000000..7d8b0ab65
Binary files /dev/null and b/public/react/src/modules/user/img/gouxuan.png differ
diff --git a/public/react/src/modules/user/img/hdkf.png b/public/react/src/modules/user/img/hdkf.png
new file mode 100755
index 000000000..a1dd25d53
Binary files /dev/null and b/public/react/src/modules/user/img/hdkf.png differ
diff --git a/public/react/src/modules/user/img/meigouxuan.png b/public/react/src/modules/user/img/meigouxuan.png
new file mode 100644
index 000000000..631b3675f
Binary files /dev/null and b/public/react/src/modules/user/img/meigouxuan.png differ
diff --git a/public/react/src/modules/user/img/mytc.png b/public/react/src/modules/user/img/mytc.png
new file mode 100755
index 000000000..28ab09698
Binary files /dev/null and b/public/react/src/modules/user/img/mytc.png differ
diff --git a/public/react/src/modules/user/img/qdkf.png b/public/react/src/modules/user/img/qdkf.png
new file mode 100755
index 000000000..ef214dcdd
Binary files /dev/null and b/public/react/src/modules/user/img/qdkf.png differ
diff --git a/public/react/src/modules/user/img/qita.png b/public/react/src/modules/user/img/qita.png
new file mode 100755
index 000000000..c7edb4174
Binary files /dev/null and b/public/react/src/modules/user/img/qita.png differ
diff --git a/public/react/src/modules/user/img/rgzn.png b/public/react/src/modules/user/img/rgzn.png
new file mode 100755
index 000000000..7f1616f4a
Binary files /dev/null and b/public/react/src/modules/user/img/rgzn.png differ
diff --git a/public/react/src/modules/user/img/sjk.png b/public/react/src/modules/user/img/sjk.png
new file mode 100755
index 000000000..ef9ccf959
Binary files /dev/null and b/public/react/src/modules/user/img/sjk.png differ
diff --git a/public/react/src/modules/user/img/skzbdx.png b/public/react/src/modules/user/img/skzbdx.png
new file mode 100755
index 000000000..7aadff97c
Binary files /dev/null and b/public/react/src/modules/user/img/skzbdx.png differ
diff --git a/public/react/src/modules/user/img/ydkf.png b/public/react/src/modules/user/img/ydkf.png
new file mode 100755
index 000000000..f770ed940
Binary files /dev/null and b/public/react/src/modules/user/img/ydkf.png differ
diff --git a/public/react/src/modules/user/img/ysj.png b/public/react/src/modules/user/img/ysj.png
new file mode 100755
index 000000000..17c08446a
Binary files /dev/null and b/public/react/src/modules/user/img/ysj.png differ
diff --git a/public/react/src/modules/user/img/yunwei.png b/public/react/src/modules/user/img/yunwei.png
new file mode 100755
index 000000000..4e0265efe
Binary files /dev/null and b/public/react/src/modules/user/img/yunwei.png differ
diff --git a/public/react/src/modules/user/img/zyrs1.png b/public/react/src/modules/user/img/zyrs1.png
new file mode 100755
index 000000000..776e70637
Binary files /dev/null and b/public/react/src/modules/user/img/zyrs1.png differ