diff --git a/public/react/src/modules/courses/coursesHome/coursesHome.js b/public/react/src/modules/courses/coursesHome/coursesHome.js
index 8f139c9bd..994e14eb9 100644
--- a/public/react/src/modules/courses/coursesHome/coursesHome.js
+++ b/public/react/src/modules/courses/coursesHome/coursesHome.js
@@ -3,10 +3,12 @@ import {getImageUrl} from 'educoder';
 import CoursesHomeCard from "./coursesHomeCard.js"
 import axios from 'axios';
 import {Input,Tooltip} from 'antd';
+import UpgradeModals from '../../modals/UpgradeModals';
 import './css/CoursesHome.css';
 import Pagination from '@icedesign/base/lib/pagination';
 import '@icedesign/base/lib/pagination/style.js';
 
+
 const Search = Input.Search;
 class coursesHome extends Component{
   constructor(props) {
@@ -51,7 +53,17 @@ class coursesHome extends Component{
   }
 
   componentDidMount(){
-    this.searchcourses(16,1,"all","")
+		const upsystem=`/users/system_update.json`;
+		axios.get(upsystem).then((response)=>{
+			let updata=response.data;
+			this.setState({
+				updata:updata
+			})
+		}).catch((error)=>{
+			console.log(error);
+		})
+
+		this.searchcourses(16,1,"all","")
   }
 
   onChange=(pageNumber)=> {
@@ -91,10 +103,12 @@ class coursesHome extends Component{
   render() {
 
     let { order,search,page,coursesHomelist }=this.state;
-   console.log(coursesHomelist)
+
     return (
     <div>
-
+			{this.state.updata===undefined?"":<UpgradeModals
+				{...this.state}
+			/>}
         <div className="newMain clearfix">
             <div className="courses-head pr" >
                 <div className="edu-txt-center pathNavLine">
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7c98c514d..1807d956c 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -1941,6 +1941,8 @@ class Listofworksstudentone extends Component {
 		axios.get(url).then((response) => {
 
 			if (response.status === 200) {
+				let starttime = this.props.getNowFormatDates(1);
+				let endtime = this.props.getNowFormatDates(2);
 				this.setState({
 					modalname: "立即发布",
 					modaltype: response.data.course_groups === null || response.data.course_groups.length === 0 ? 2 : 1,
@@ -1958,8 +1960,7 @@ class Listofworksstudentone extends Component {
 					Saves: this.homeworkstartend,
 					course_groups: response.data.course_groups,
 				})
-				let starttime = this.props.getNowFormatDates(1);
-				let endtime = this.props.getNowFormatDates(2);
+
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -2453,7 +2454,7 @@ class Listofworksstudentone extends Component {
 
 								<div className="clearfix">
                                 <span className="fl color-grey-6 font-12"><span
-																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
+																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.student_works&&teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
 									<style>
 										{
 											`
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 5400368ec..92f3c9f44 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -10,6 +10,8 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 
 import SiderBar from '../tpm/SiderBar';
 
+import UpgradeModals from '../modals/UpgradeModals';
+
 import { SnackbarHOC , getImageUrl} from 'educoder';
 
 import Slider from '@icedesign/base/lib/slider';
@@ -35,6 +37,15 @@ class ShixunsHome extends Component {
         }
     }
     componentDidMount(){
+			const upsystem=`/users/system_update.json`;
+			axios.get(upsystem).then((response)=>{
+				let updata=response.data;
+				this.setState({
+					updata:updata
+				})
+			}).catch((error)=>{
+				console.log(error);
+			})
         let url=`/home/index.json`;
         axios.get(url).then((response)=> {
             if(response.status===200){
@@ -106,6 +117,9 @@ class ShixunsHome extends Component {
 
         return (
             <div className="newMain clearfix   backFAFAFA">
+							{this.state.updata===undefined?"":<UpgradeModals
+								{...this.state}
+							/>}
 									<Spin spinning={hometypepvisible}  size="large" style={{marginTop:'15%'}}>
                     {/*懒加载*/}
 
diff --git a/public/react/src/modules/login/EducoderInteresse.js b/public/react/src/modules/login/EducoderInteresse.js
index b7109d279..c69b2195d 100644
--- a/public/react/src/modules/login/EducoderInteresse.js
+++ b/public/react/src/modules/login/EducoderInteresse.js
@@ -5,6 +5,7 @@ import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
 import educodernet from '../../../src/images/login/educodernet.png';
 import InterestpageComponent from '../user/Interestpage'
+import InterestpageComponentMax from '../user/InterestpageMax'
 //educoder登入页面
 
 var newContainer={
@@ -20,7 +21,7 @@ var newContainer={
 	bottom: "0px",
 	minHeight: "100%",
 	overflow:"hidden",
-	paddingTop: "40px",
+
 
 }
 class EducoderInteresse extends Component {
@@ -38,6 +39,7 @@ class EducoderInteresse extends Component {
 
 
 	render() {
+		console.log( window.screen.width);
 		return (
 			<div style={newContainer} className=" clearfix" >
 
@@ -48,7 +50,9 @@ class EducoderInteresse extends Component {
 						"align-items": "center",
 						"width": "100%"
 					}}>
-						<div >
+						<div style={{
+							paddingTop: "2%",
+						}}>
 							<img src={educodernet}/>
 						</div>
 
@@ -59,10 +63,16 @@ class EducoderInteresse extends Component {
 								display: "flex",
 								justifyContent: "center",
 								width: "100%",
-								marginTop: "20px",
+								marginTop: "1%",
 							}}>
-								<InterestpageComponent {...this.props} {...this.state}>
-								</InterestpageComponent>
+						{ window.screen.width <=1390?
+					  	<InterestpageComponent {...this.props} {...this.state}>
+							</InterestpageComponent>
+							:
+							<InterestpageComponentMax {...this.props} {...this.state}/>
+
+						}
+
 							</div>
 
 					<div style={{
diff --git a/public/react/src/modules/modals/UpgradeModals.js b/public/react/src/modules/modals/UpgradeModals.js
new file mode 100644
index 000000000..e3d882ff4
--- /dev/null
+++ b/public/react/src/modules/modals/UpgradeModals.js
@@ -0,0 +1,82 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Spin, Icon , Modal} from 'antd';
+import moment from 'moment';
+class UpgradeModals extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+			system_updates:false
+    }
+  }
+
+  updatasmodals=()=>{
+		let {updata} = this.props;
+		if(updata&&updata.system_update===true){
+			let SystemUpdateEndTime = localStorage.getItem('SystemUpdateEndTime');
+			if(SystemUpdateEndTime===null){
+				this.setState({
+					system_updates:true
+				})
+			}else if(SystemUpdateEndTime===undefined){
+				this.setState({
+					system_updates:true
+				})
+			}else if(moment(SystemUpdateEndTime) < moment(updata.end_time)){
+				this.setState({
+					system_updates:true
+				})
+			}
+		}
+	}
+
+	componentDidMount() {
+    this.updatasmodals()
+	}
+
+	componentDidUpdate(prevProps){
+		// if (prevProps.data!=this.props.updata){
+		// 	this.updatasmodals()
+		// }
+	}
+
+	setmodalSave=()=>{
+		let {updata}=this.props;
+		localStorage.setItem('SystemUpdateEndTime',updata.end_time);
+		this.setState({
+			system_updates:false
+		})
+	}
+
+
+render() {
+    // const antIcons = <Icon type="loading" style={{ fontSize: 24 }} spin />
+	{/*<Spin indicator={antIcons} spinning={this.state.system_updates} >*/}
+
+	{/*</Spin>*/}
+	  let {system_updates}=this.state;
+    let {updata}=this.props;
+    return(
+         <Modal
+          keyboard={false}
+          title={updata&&updata.subject}
+					visible={system_updates}
+          // visible={this.props.modalsType===undefined?false:this.props.modalsType}
+          closable={false}
+          footer={null}
+          destroyOnClose={true}
+          centered={true}
+          width="530px"
+        >
+					 <div className="task-popup-content">
+              <pre className="break-word break-word-firefox">{updata&&updata.system_score}</pre>
+						 <div className="clearfix edu-txt-center mt20">
+							 <a className="task-btn task-btn-orange pop_close" onClick={()=>this.setmodalSave()}>知道啦</a>
+						 </div>
+					 </div>
+        </Modal>
+    )
+  }
+}
+
+export default UpgradeModals;
\ No newline at end of file
diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js
index c37754d62..da19e0521 100644
--- a/public/react/src/modules/paths/ShixunPathSearch.js
+++ b/public/react/src/modules/paths/ShixunPathSearch.js
@@ -1,13 +1,15 @@
 import React, { Component } from 'react';
-import PathCard from "./ShixunPathCard.js"
+import PathCard from "./ShixunPathCard.js";
 import axios from 'axios';
 import {Input} from 'antd';
+import UpgradeModals from '../modals/UpgradeModals';
 import Pagination from '@icedesign/base/lib/pagination';
 import '@icedesign/base/lib/pagination/style.js';
-import './ShixunPaths.css'
+import './ShixunPaths.css';
 
 
 const Search = Input.Search;
+
 class ShixunPathSearch extends Component{
   constructor(props) {
       super(props)
@@ -65,7 +67,17 @@ class ShixunPathSearch extends Component{
 
 
   componentDidMount(){
-    let { order,select,search,page }=this.state;
+		const upsystem=`/users/system_update.json`;
+		axios.get(upsystem).then((response)=>{
+			let updata=response.data;
+			this.setState({
+				updata:updata
+			})
+		}).catch((error)=>{
+			console.log(error);
+		})
+
+		let { order,select,search,page }=this.state;
     this.getList(order,select,search,page );
   }
 
@@ -96,7 +108,9 @@ class ShixunPathSearch extends Component{
     let { order,sortList,search,page,total_count,select }=this.state;
       return (
         <div>
-
+					{this.state.updata===undefined?"":<UpgradeModals
+							{...this.state}
+						/>}
           <div className="path-head pr">
             <div className="edu-txt-center pathNavLine">
               <div className="inline path-nav">
diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
index 5efd31c3b..468afc43a 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js
@@ -18,6 +18,8 @@ import ShixunSearchBar from './ShixunSearchBar';
 
 import ShixunCard from './ShixunCard';
 
+import UpgradeModals from '../../modals/UpgradeModals';
+
 const queryString = require('query-string');
 
 const $ = window.$;
@@ -45,7 +47,20 @@ class ShixunsIndex extends Component {
         }
     }
     componentDidMount(){
-        let _keyword;
+
+			const upsystem=`/users/system_update.json`;
+			axios.get(upsystem).then((response)=>{
+				let updata=response.data;
+				this.setState({
+					updata:updata
+				})
+			}).catch((error)=>{
+				console.log(error);
+			})
+
+
+
+			let _keyword;
         if (window.__headSearchKeyword) {
             this.setState({ keyword: window.__headSearchKeyword })
             _keyword = window.__headSearchKeyword
@@ -364,8 +379,12 @@ class ShixunsIndex extends Component {
     render() {
         let {middleshixundata, typepvisible, pages, search_tags, keyword,parsedid,newtag_level,newpalce} = this.state;
 
+        console.log(this.state.updata)
         return (
             <div className="newMain clearfix  backFAFAFA">
+							{this.state.updata===undefined?"":<UpgradeModals
+								{...this.state}
+							/>}
                 {/*<Spin spinning={typepvisible}  size="large" style={{marginTop:'15%'}}>*/}
                     <ShixunSearchBar
                         Updatasearchlist={this.Updatasearchlist.bind(this)}
diff --git a/public/react/src/modules/user/Interestpage.js b/public/react/src/modules/user/Interestpage.js
index b806780eb..5b4b69cf6 100644
--- a/public/react/src/modules/user/Interestpage.js
+++ b/public/react/src/modules/user/Interestpage.js
@@ -2,9 +2,9 @@ import React, {Component} from 'react';
 import {Button,notification} from 'antd';
 import {broadcastChannelPostMessage} from 'educoder';
 import MyEduCoderModal from './MyEduCoderModal';
-// import Notcompleted from '../../common/Notcompleted';
 import axios from 'axios';
 import './common.css';
+import './MyeducoderI.css'
 import mytc from './img/mytc.png';
 import skzbdx from './img/skzbdx.png';
 import zyrs1 from './img/zyrs1.png';
@@ -31,7 +31,7 @@ class InterestpageComponent extends Component {
 			passmm:this.props.passmm,
 			homedatalist:undefined,
 			hometypepvisible: undefined,
-			MyEduCoderModals:false
+			MyEduCoderModals:false,
 		}
 	}
 	openNotification = (messge) => {
@@ -45,12 +45,13 @@ class InterestpageComponent extends Component {
 		});
 	}
 	componentDidMount(){
+		console.log("min");
 		let{gouxuans4} =this.state;
 		let url=`/repertoires.json`;
 		axios.get(url).then((response)=> {
 			if(response){
-				console.log("53");
-				console.log(response.data);
+				// console.log("53");
+				// console.log(response.data);
 				for(var i=0;i<response.data.repertoires.length;i++){
 					var qdkfys="";
 					if(response.data.repertoires[i].id===1){
@@ -76,14 +77,13 @@ class InterestpageComponent extends Component {
 						gouxuans4:gouxuans4,
 					})
 				}
-				console.log("75");
-				console.log(gouxuans4);
+				// console.log("75");
+				// console.log(gouxuans4);
 
 			}
 		}).catch((error)=>{
 			console.log(error)
 		});
-
 	}
 	componentWillReceiveProps(nextProps) {
 		// console.log("46");
@@ -121,7 +121,7 @@ class InterestpageComponent extends Component {
 
 
 	Clickteacher=(e)=>{
-    console.log(e);
+    // console.log(e);
     if(e === "teacher"){
       this.setState({
 				gouxuans:"teacher",
@@ -137,12 +137,12 @@ class InterestpageComponent extends Component {
 		}
 	}
 	Clickteacher2=(e)=>{
-		console.log(e);
+		// console.log(e);
 		let {gouxuans4} =this.state;
     for (var i=0;i<gouxuans4.length;i++){
     	if(gouxuans4[i].id === e){
-    		console.log("51");
-    		console.log(e);
+    		// console.log("51");
+    		// console.log(e);
     		if(gouxuans4[i].bool === true){
 					gouxuans4[i].bool=false;
 				}else{
@@ -150,7 +150,7 @@ class InterestpageComponent extends Component {
 				}
 			}
 		}
-    console.log(gouxuans4);
+    // console.log(gouxuans4);
     this.setState({
 			gouxuans4:gouxuans4,
 		})
@@ -239,10 +239,10 @@ class InterestpageComponent extends Component {
 			gouxuans,
 			gouxuans4,
 		} = this.state
-		// height: 346px;
+		console.log(window.screen.width);
 		return (
 
-			<div className="ysllogin_register_contents" style={{width:"800px",height: "550px"}}>
+			<div className="ysllogin_register_contents" style={{width:"60%"}}>
 
 				<MyEduCoderModal
 					modalsType={this.state.MyEduCoderModals}
@@ -250,37 +250,37 @@ class InterestpageComponent extends Component {
 				/>
 
 				<div className="ysllogin_section">
-					<div className="mt15"><span className="yslspans1">请选择你的职业</span></div>
+					<div style={{marginTop: "1%"}}><span className="yslspans1">请选择你的职业</span></div>
 					<div className="ysldivhome1" >
           <div className="ysldivhomediv" style={{marginLeft:"30px"}} >
 					<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 className="ysldivhomedivimgsy" ><img src={skzbdx} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" style={{ marginLeft:"101px",marginRight:"101px"}}>
 						<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 className="ysldivhomedivimgsy"><img src={mytc} className="ysldivhomedivimg"/></div>
           </div>
           <div className="ysldivhomediv" >
 						<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 className="ysldivhomedivimgsy"><img src={zyrs1} className="ysldivhomedivimg"/></div>
           </div>
 					</div>
-					<div><span className="yslspans2">选择你可能感兴趣的内容</span></div>
-
-					<div ><span className="yslspans3">基于你关注的内容推荐</span></div>
+					 <p className="yslspans2">选择你可能感兴趣的内容</p>
+				  <p className="yslspans3">基于你关注的内容推荐</p>
 					<div className="ysldivhome2">
 
 					{gouxuans4&&gouxuans4.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 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}/>
+											<p className="textall">{item.name}</p>
+										</div>
+
 								)
 							})}
 					</div>
-					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "35px",background: "#4CACFF",marginTop: "17px"} }>完成</Button>
+					<Button className="yslbutton" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "35px",background: "#4CACFF",marginTop: "2%",marginBottom:" 2%",}}>完成</Button>
 				</div>
 
 			</div>
diff --git a/public/react/src/modules/user/InterestpageMax.js b/public/react/src/modules/user/InterestpageMax.js
new file mode 100644
index 000000000..17be9198e
--- /dev/null
+++ b/public/react/src/modules/user/InterestpageMax.js
@@ -0,0 +1,291 @@
+import React, {Component} from 'react';
+import {Button,notification} from 'antd';
+import {broadcastChannelPostMessage} from 'educoder';
+import MyEduCoderModal from './MyEduCoderModal';
+// import Notcompleted from '../../common/Notcompleted';
+import axios from 'axios';
+import './commontwo.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 InterestpageMax extends Component {
+	constructor(props) {
+		super(props)
+		this.state = {
+			gouxuans: "",
+			gouxuans2:0,
+			gouxuans4:[],
+			namezh:this.props.namezh,
+			passmm:this.props.passmm,
+			homedatalist:undefined,
+			hometypepvisible: undefined,
+			MyEduCoderModals:false
+		}
+	}
+	openNotification = (messge) => {
+		// type  1 成功提示绿色 2提醒颜色黄色 3错误提示红色
+		notification.open({
+			message: "提示",
+			description: messge,
+			onClick: () => {
+				console.log('Notification Clicked!');
+			},
+		});
+	}
+	componentDidMount(){
+		console.log("max");
+		let{gouxuans4} =this.state;
+		let url=`/repertoires.json`;
+		axios.get(url).then((response)=> {
+			if(response){
+				console.log("53");
+				console.log(response.data);
+				for(var i=0;i<response.data.repertoires.length;i++){
+					var qdkfys="";
+					if(response.data.repertoires[i].id===1){
+						qdkfys=qdkf;
+					}if(response.data.repertoires[i].id===2){
+						qdkfys=hdkf;
+					}if(response.data.repertoires[i].id===3){
+						qdkfys=ydkf;
+					}if(response.data.repertoires[i].id===4){
+						qdkfys=sjk;
+					}if(response.data.repertoires[i].id===5){
+						qdkfys=ysj;
+					}if(response.data.repertoires[i].id===6){
+						qdkfys=yunwei;
+					}if(response.data.repertoires[i].id===8){
+						qdkfys=qita;
+					}if(response.data.repertoires[i].id===9){
+						qdkfys=rgzn;
+					}
+					var datas={id:response.data.repertoires[i].id,name:response.data.repertoires[i].name,bool:false,url:qdkfys};
+					gouxuans4.push(datas);
+					this.setState({
+						gouxuans4:gouxuans4,
+					})
+				}
+				console.log("75");
+				console.log(gouxuans4);
+
+			}
+		}).catch((error)=>{
+			console.log(error)
+		});
+
+	}
+	componentWillReceiveProps(nextProps) {
+		// console.log("46");
+		// console.log(nextProps);
+		// console.log(this.props);
+		if (nextProps.namezh != this.props.namezh) {
+			// console.log("50");
+			// console.log(nextProps.user);
+			if (nextProps.namezh !== undefined) {
+				// console.log("53");
+				// console.log(nextProps.user);
+				this.setState({
+					namezh: nextProps.namezh,
+				})
+			}
+
+
+		}
+		if (nextProps.passmm != this.props.passmm) {
+			// console.log("50");
+			// console.log(nextProps.user);
+			if (nextProps.passmm !== undefined) {
+				// console.log("53");
+				// console.log(nextProps.user);
+				this.setState({
+					passmm: nextProps.passmm,
+				})
+			}
+
+
+		}
+
+
+	}
+
+
+	Clickteacher=(e)=>{
+		console.log(e);
+		if(e === "teacher"){
+			this.setState({
+				gouxuans:"teacher",
+			})
+		}else if(e ==="student"){
+			this.setState({
+				gouxuans:"student",
+			})
+		}else if(e === "professional"){
+			this.setState({
+				gouxuans:"professional",
+			})
+		}
+	}
+	Clickteacher2=(e)=>{
+		console.log(e);
+		let {gouxuans4} =this.state;
+		for (var i=0;i<gouxuans4.length;i++){
+			if(gouxuans4[i].id === e){
+				console.log("51");
+				console.log(e);
+				if(gouxuans4[i].bool === true){
+					gouxuans4[i].bool=false;
+				}else{
+					gouxuans4[i].bool=true;
+				}
+			}
+		}
+		console.log(gouxuans4);
+		this.setState({
+			gouxuans4:gouxuans4,
+		})
+
+	}
+
+	setMyEduCoderModals=()=>{
+		this.setState({
+			MyEduCoderModals:true
+		})
+	}
+
+	//兴趣页面点击
+	Interestcompletionpage(){
+		if(this.state.gouxuans.length === 0){
+			this.openNotification("请选择您的职业");
+			return
+		}
+
+		var ints=[];
+		for (var i =0;i<this.state.gouxuans4.length;i++) {
+			if(this.state.gouxuans4[i].bool === true){
+				ints.push(this.state.gouxuans4[i].id);
+			}
+		}
+		if(ints.length<1){
+			this.openNotification("内容是最少得选一个");
+			return
+		}
+		var url = "/users/interest.json";
+		axios.post(url, {
+			identity:this.state.gouxuans,
+			interest_ids: ints,
+		}).then((response) => {
+			if (response !== undefined) {
+				// this.Jumptotheinterestpage();
+				// 	window.location.href = "/"
+				this.setMyEduCoderModals()
+			}
+
+
+		}).catch((error) => {
+			console.log(error);
+
+		})
+	}
+
+	// //跳转然后登入
+	// Jumptotheinterestpage=()=>{
+	// 	console.log(this.state.login);
+	// 	console.log(this.state.password);
+	// 	var url = "/accounts/login.json";
+	// 	axios.post(url, {
+	// 		login: this.props.login,
+	// 		password: this.props.password,
+	// 	}).then((response) => {
+	// 		if (response === undefined) {
+	// 			return
+	// 		}
+	// 		if (response.status === 200) {
+	// 			// if (response.data.status === 402) {
+	// 			// 	window.location.href = response.data.url;
+	// 			// } else {
+	// 			// 	broadcastChannelPostMessage('refreshPage')
+	// 			// 	this.setState({
+	// 			// 		isRender: false
+	// 			// 	})
+	// 				window.location.href = "/"
+	// 			// }
+	// 		}
+	//
+	//
+	// 	}).catch((error) => {
+	// 		console.log(error);
+	// 	})
+	// }
+	setNotcompleteds=()=>{
+		this.setState({
+			Notcompleteds:true,
+			MyEduCoderModals:false
+		})
+	}
+
+	render() {
+		const {
+			gouxuans,
+			gouxuans4,
+		} = this.state
+		// height: 346px;
+		return (
+
+			<div className="ysllogin_register_contents2" style={{width:"800px",height: "550px"}}>
+
+				<MyEduCoderModal
+					modalsType={this.state.MyEduCoderModals}
+					setNotcompleteds={()=>{this.setNotcompleteds()}}
+				/>
+
+				<div className="ysllogin_section2">
+					<div className="mt15"><span className="yslspans12">请选择你的职业</span></div>
+					<div className="ysldivhome12" >
+						<div className="ysldivhomediv222" style={{marginLeft:"30px"}} >
+							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("teacher")}>{gouxuans ==="teacher"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}老师</div>
+							<div className="ysldivhomedivimg2" ><img src={skzbdx} className="ysldivhomedivimg2"/></div>
+						</div>
+						<div className="ysldivhomediv222" style={{ marginLeft:"101px",marginRight:"101px"}}>
+							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("student")}>{gouxuans==="student"? <img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}学生</div>
+							<div className="ysldivhomedivimg2"><img src={mytc} className="ysldivhomedivimg2"/></div>
+						</div>
+						<div className="ysldivhomediv222" >
+							<div className="ysldivhomedivtxt2" onClick={()=>this.Clickteacher("professional")}>{gouxuans==="professional"?<img src={gouxuan} className="gouxuanimg2"/>:<img className="gouxuanimg2" src={meigouxuan}/>}专业人士</div>
+							<div className="ysldivhomedivimg2"><img src={zyrs1} className="ysldivhomedivimg2"/></div>
+						</div>
+					</div>
+					<div><span className="yslspans22">选择你可能感兴趣的内容</span></div>
+					<div ><span className="yslspans32">基于你关注的内容推荐</span></div>
+					<div className="ysldivhome22">
+
+						{gouxuans4&&gouxuans4.map((item,key)=>{
+							return(
+								<div className={item.id<5?"ysldivhomediv12":"ysldivhomediv22"} onClick={()=>this.Clickteacher2(item.id)}>
+									{item.bool===true?<img src={gouxuan} className="yslgouxuanimg2"/>:<div className="yslgouxuanimg22"></div>}
+									<img className="div1img2" src={item.url}/>
+									<span className="textall2">{item.name}</span>
+								</div>
+							)
+						})}
+					</div>
+					<Button className="yslbutton2" size={"large"} type="primary"onClick={()=>this.Interestcompletionpage()} style={{width:"255px",height: "35px",background: "#4CACFF",marginTop: "17px"} }>完成</Button>
+				</div>
+
+			</div>
+		);
+	}
+}
+
+export default (InterestpageMax);
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 9281d228c..b761a910f 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -944,7 +944,10 @@ class LoginRegisterComponent extends Component {
                                       value={Agreetotheterms}
                             ><span className="font-14 "  style={{
                                 color: '#676767',
-                            }}>我已阅读并同意服务协议条款</span></Checkbox>
+                            }}>我已阅读并同意
+															<span>
+																<a href={'/help?index=4'} target="_blank" >《服务协议条款》</a>
+															</span></span></Checkbox>
                             <Button className=" font-16" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
                                     size={"large"}>注册</Button>
 
diff --git a/public/react/src/modules/user/MyeducoderI.css b/public/react/src/modules/user/MyeducoderI.css
new file mode 100644
index 000000000..4c9d6ade3
--- /dev/null
+++ b/public/react/src/modules/user/MyeducoderI.css
@@ -0,0 +1,3 @@
+.yslfont {
+      font-size: 10%;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 0e00b623d..6271c9941 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -68,79 +68,79 @@
     flex-direction: row;
     margin-left: 100px;
     margin-right: 129px;
-    margin-top: 10px;
   }
   .ysldivhome2{
+    width: 100%;
     display: flex;
     flex-flow: row wrap;
     align-content:stretch;
   }
   .ysldivhomediv{
     width: 101px;
-    height: 130px;
-
   }
   .ysldivhomediv1{
-    width: 110px;
-    height: 110px;
+    width: 17%;
+    height: 100px;
     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: 5px;
+    margin-left: 6.5%;
+    margin-top: 1%;
   }
 .ysldivhomediv2{
-  width: 110px;
-  height: 110px;
+  width: 17%;
+  height: 100px;
   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;
+  margin-left: 6.5%;
+  margin-top: 3%;
 }
   .ysldivhomedivtxt{
-    width:101px;
+    width:86%;
     height:27px;
     margin-bottom: 5px;
     font-size: 14px;
     text-align: center;
 
+  }
+  .ysldivhomedivimgsy{
+
   }
   .ysldivhomedivimg{
-    width: 90px;
-    height: 90px;
+    width: 80%;
   }
   .ysllogin_register_contents{
     display: flex;
     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: 600px;
     display: flex;
     align-items: center;
     flex-direction: column;
+    box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+    border-radius:6px;
+    background: #fff;
   }
   .yslspans1{
     text-align: center;
-    font-size: 16px;
+    font-size: 13px;
     color: #111C24;
   }
   .yslspans2{
     text-align: center;
-    font-size: 15px;
+    font-size: 13px;
     color: #05101A;
+    margin-top: 1%;
   }
   .yslspans3{
     text-align: center;
-    font-size: 13px;
+    font-size: 12px;
     color: #656565;
   }
   .yslbutton{
@@ -164,15 +164,15 @@
   .div1img{
     display: flex;
     justify-content:center;
-    width: 60px;
-    margin-left: 26px;
+    width: 42%;
+    margin-left: 30%;
 
   }
 .yslgouxuanimg{
-  width: 20px;
+  width: 20%;
   height: 20px;
-  margin-left: 75px;
-
+  margin-left: 86%;
+  float: right;
 }
 .yslgouxuanimg2{
   height: 20px;
diff --git a/public/react/src/modules/user/commontwo.css b/public/react/src/modules/user/commontwo.css
new file mode 100644
index 000000000..36bbf248c
--- /dev/null
+++ b/public/react/src/modules/user/commontwo.css
@@ -0,0 +1,265 @@
+/*.login_register_content, .login_register_content .ant-tabs-tabpane {*/
+/*  !*display: flex;*!*/
+/*  justify-content: center;*/
+/*}*/
+.login_register_content .ant-input {
+    background:rgb(244,244,244);
+}
+.login_register_content .loginInputzhucheyslass{
+    border:1px solid red !important;
+}
+.login_register_content .loginInputzhucheyslass:hover{
+    border:1px solid red !important;
+}
+.login_register_content {
+    width: 434px;
+    box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+    border-radius:6px;
+    background: #fff;
+}
+.login_register_content .ant-tabs-ink-bar {
+    width: 21px !important;
+    left: 19px;
+}
+.login_register_content .ant-tabs {
+    width: 354px;
+}
+
+.login_section {
+    width: 100%;
+    display:flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+}
+.login_sectionysl{
+    width: 100%;
+    display:flex;
+    align-items: center;
+    flex-direction: column;
+}
+.loginInput {
+    width: 100%;
+    margin-bottom: 16px;
+    height: 45px;
+}
+
+.educouddiv {
+    display: flex;
+    flex-direction: column;
+}
+
+
+.left_right {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+}
+.login_btn {
+    width: 100%;
+    margin-top: 26px;
+    margin-bottom: 26px;
+}
+.dragValidator {
+    margin-bottom: 16px;
+}
+.ysldivhome12{
+    display: flex;
+    flex-direction: row;
+    margin-left: 100px;
+    margin-right: 129px;
+    margin-top: 10px;
+}
+.ysldivhome22{
+    display: flex;
+    flex-flow: row wrap;
+    align-content:stretch;
+}
+.ysldivhomediv222{
+    width: 101px;
+    height: 130px;
+
+}
+.ysldivhomediv12{
+    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: 5px;
+}
+.ysldivhomediv22{
+    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;
+}
+.ysldivhomedivtxt2{
+    width:101px;
+    height:27px;
+    margin-bottom: 5px;
+    font-size: 14px;
+    text-align: center;
+
+}
+.ysldivhomedivimg2{
+    width: 90px;
+    height: 90px;
+}
+.ysllogin_register_contents2{
+    display: flex;
+    justify-content: center;
+    box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+    border-radius:6px;
+    background: #fff;
+}
+.ysllogin_section2 {
+    width:800px;
+    height: 600px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+}
+.yslspans12{
+    text-align: center;
+    font-size: 16px;
+    color: #111C24;
+}
+.yslspans22{
+    text-align: center;
+    font-size: 15px;
+    color: #05101A;
+}
+.yslspans32{
+    text-align: center;
+    font-size: 13px;
+    color: #656565;
+}
+.yslbutton2{
+    width:255px;
+    height: 36px;
+    margin-top: 20px;
+
+}
+.mt22{
+    margin-top: 22px;
+}
+.gouxuanimg2{
+    margin-right: 10px;
+    margin-bottom: 2px;
+}
+.textall2{
+    text-align: center;
+    font-size: 13px;
+    color: #4B4B4B;
+}
+.div1img2{
+    display: flex;
+    justify-content:center;
+    width: 60px;
+    margin-left: 26px;
+
+}
+.yslgouxuanimg22{
+    width: 20px;
+    height: 20px;
+    margin-left: 75px;
+
+}
+.yslgouxuanimg2{
+    height: 20px;
+}
+
+.yslbutondls{
+    display: flex;
+    flex-direction:row;
+}
+。yslinpulsy input{
+
+}
+.loginInputzhuche{
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+
+}
+.loginInputzhucheyslass {
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+
+}
+.loginInputzhucheyslass .ant-input{
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+    position: relative;
+    right: 5px;
+    width: 103%;
+    border: 1px solid #FF0000!important;
+    border-radius: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+}
+.loginInputzhucheyslass .ant-input:hover{
+    border: 1px solid #FF0000!important;
+
+}
+.loginInputzhuche .ant-input{
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+    position: relative;
+    right: 5px;
+    width: 103%;
+}
+
+.loginInputzhucheysl{
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+    border-radius: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+
+}
+.loginInputzhucheysl .ant-input{
+    width: 100%;
+    background-color: #fff!important;
+    height: 45px !important;
+    padding: 5px;
+    position: relative;
+    right: 5px;
+    width: 103%;
+    border: 1px solid #FF0000!important;
+    border-radius: 4px;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom-left-radius: 4px;
+}
+.loginInputzhucheysl .ant-input:hover{
+    border: 1px solid #FF0000!important;
+}
+
+.bth100{
+    width: 100px;
+    margin: 0 auto;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 1a321dc51..42a713a88 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -5,7 +5,7 @@ import {Tooltip,Menu} from 'antd';
 import Loadable from 'react-loadable';
 import Loading from '../../../Loading';
 import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-
+import UpgradeModals from '../../modals/UpgradeModals';
 import axios from 'axios';
 import {getImageUrl} from 'educoder';
 import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
@@ -13,7 +13,7 @@ import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
 import "./usersInfo.css"
 import "../../courses/css/members.css"
 import "../../courses/css/Courses.css"
-import update from 'immutability-helper'
+
 
 import Trialapplication from '../../login/Trialapplication'
 
@@ -51,12 +51,23 @@ class Infos extends Component{
     }
   }
   componentDidMount =()=>{
-    this.getInfo(this.props.match.params.username);
+		let upsystem=`/users/system_update.json`;
+		axios.get(upsystem).then((response)=>{
+			let updata=response.data;
+			this.setState({
+				updata:updata
+			})
+		}).catch((error)=>{
+			console.log(error);
+		})
+
+		this.getInfo(this.props.match.params.username);
   }
+
+
   //判断是否看的是当前用户的个人主页
   componentDidUpdate =(prevProps)=> {
     if(this.props.current_user && prevProps.current_user != this.props.current_user){
-      console.log(this.props);
       if(this.props.current_user.login != this.props.match.params.username){
         this.setState({
           is_current:false,
@@ -214,6 +225,9 @@ class Infos extends Component{
      moduleName=pathname.split("/")[3];
     return(
       <div className="newMain">
+				{this.state.updata===undefined?"":<UpgradeModals
+					{...this.state}
+				/>}
         {
           isRenders && <Trialapplication {...this.props} {...this.state} Cancel={() => this.cancelModulationModels()}/>
         }