diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index e382625b0..4868171a1 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -206,18 +206,14 @@ class Testpapersettinghomepage extends Component{
 			Loadtype:false
 		})
 	}
-	// DownloadType=()=>{
-	// 	this.setState({
-	// 		DownloadType:false,
-	// 		DownloadMessageval:undefined
-	// 	})
-	// }
-	// Downloadcal=()=>{
-	// 	this.setState({
-	// 		DownloadType:false,
-	// 		DownloadMessageval:undefined
-	// 	})
-	// }
+    gotohome=()=>{
+        let courseId=this.props.match.params.coursesId;
+        if(courseId===undefined){
+            this.props.history.push("/courses");
+        }else{
+            this.props.history.push(this.props.current_user.first_category_url);
+        }
+    }
     render(){
         let {tab,visible,Commonheadofthetestpaper}=this.state;
         const isAdmin =this.props.isAdmin();
@@ -251,7 +247,7 @@ class Testpapersettinghomepage extends Component{
 
                     <div className="educontent mb20" style={{width:"1200px"}}>
                         <p className="clearfix mb20 mt10">
-                            <ActionBtn className=" btn colorgrey fl hovercolorblue "  to={`/courses/${this.props.match.params.coursesId}/students}`}>{this.props.coursedata.name}</ActionBtn>
+                            <ActionBtn className=" btn colorgrey fl hovercolorblue "  onClick={()=>this.gotohome()}>{this.props.coursedata.name}</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                             <ActionBtn className=" btn colorgrey fl hovercolorblue "   to={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`} >试卷</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -274,9 +270,7 @@ class Testpapersettinghomepage extends Component{
                         <CoursesListType
                             typelist={[`${polls_status[Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status]}`]}
                         />
-                        <a className="color-grey-6 fr font-16  summaryname  mr30"
-
-                           href={`/courses/${this.props.match.params.coursesId}/exercises/${Commonheadofthetestpaper&&Commonheadofthetestpaper.user_permission.left_banner_id}`}>返回</a>
+                        <a className="color-grey-6 fr font-16  summaryname  mr30" onClick={()=>this.gotohome()}>返回</a>
                         <p className="color-grey-6 fr font-16"> </p>
 
                     </div>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index d9e589bd4..91639d240 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -111,7 +111,14 @@ class ShixunHomeworkPage extends Component {
 
 	bindRef = ref => { this.child = ref }
 ///////////////教师截止
-
+  gotohome=()=>{
+		let courseId=this.props.match.params.coursesId;
+		if(courseId===undefined){
+			this.props.history.push("/courses");
+		}else{
+			this.props.history.push(this.props.current_user.first_category_url);
+		}
+	}
 	render() {
 		let {tab, teacherdatapage,  jobsettingsdatapage} = this.state;
 
@@ -125,8 +132,7 @@ class ShixunHomeworkPage extends Component {
 
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">
-							<ActionBtn className=" btn colorgrey fl hovercolorblue "
-												 to={`/courses/${this.props.match.params.coursesId}/students`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</ActionBtn>
+							<ActionBtn className=" btn colorgrey fl hovercolorblue " onClick{()=>this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</ActionBtn>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<ActionBtn
 								className=" btn colorgrey fl hovercolorblue "
@@ -142,8 +148,7 @@ class ShixunHomeworkPage extends Component {
 						<CoursesListType
 							typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
 						/>
-						<a className="color-grey-9 fr font-16  summaryname  ml20 mr20"
-							 href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>返回</a>
+						<a className="color-grey-9 fr font-16  summaryname  ml20 mr20" onClick{()=>this.gotohome()}>返回</a>
 						<a className="color-grey-9 fr font-16 mr20"
 							 href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
 							 target={"_blank"}>实训详情</a>
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 14d80181a..713593100 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -120,6 +120,9 @@ class EducoderLogin extends Component {
         })
 
     }
+    gohome=()=>{
+        window.location.href="/"
+    }
     Setshowbool = (e,name,pass) => {
         if (e===1) {
             this.setState({
@@ -146,7 +149,7 @@ class EducoderLogin extends Component {
                         "width": "100%"
                     }}>
                         <div >
-                            <img src={educodernet}/>
+                            <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
                         </div>
 
 
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 20436f3c7..791110b0b 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -708,7 +708,7 @@ submittojoinclass=(value)=>{
 											onInput={()=>this.onKeywordSearchKeyDowns()}
 											onSearch={(value) => this.onKeywordSearchKeyDown(value)}
                       // onPressEnter={this.onKeywordSearchKeyDown}
-                      style={{ width: 300 }}
+                      style={{ width: 300,height:32}}
 											autoFocus={true}
                   />
                 </div>:""}
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index 7df2d82c5..19b5a7388 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -12,6 +12,7 @@ import ReadPassword from './ReadPassword';
 
 import axios from 'axios';
 import './common.css'
+import './commontwo.css'
 
 const TabPane = Tabs.TabPane
 const loginInputsyl = {
@@ -27,7 +28,7 @@ class LoginRegisterComponent extends Component {
 			login: "",
 			password: "",
 			passwords: "",
-			seconds: 35,
+			seconds: 60,
 			codes: "",
 			getverificationcodes: true,
 			Phonenumberisnotcobool: false,
@@ -126,7 +127,7 @@ class LoginRegisterComponent extends Component {
 						clearInterval(timer);
 						this.setState({
 							getverificationcodes: false,
-							seconds: 35,
+							seconds: 60,
 						})
 					}
 				});
@@ -144,7 +145,7 @@ class LoginRegisterComponent extends Component {
 						clearInterval(timer);
 						this.setState({
 							getverificationcodes: false,
-							seconds: 35,
+							seconds: 60,
 
 						})
 					}
@@ -600,6 +601,7 @@ class LoginRegisterComponent extends Component {
 									height={38} successGreenColor="#29bd8b"
 									style={{height: "38px", width: "100%"}}
 									dragOkCallback={()=>this.dragOkCallback()}
+									className="ysllw100"
 								></DragValidator>
 								:
 								""
@@ -611,6 +613,7 @@ class LoginRegisterComponent extends Component {
 									height={38} successGreenColor="#29bd8b"
 									style={{height: "38px", width: "100%"}}
 									dragOkCallback={()=>this.dragOkCallback()}
+									className="ysllw100"
 								></DragValidatortwo>
 								:
 								""
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index b761a910f..ff3eba33d 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -9,6 +9,7 @@ import passoff from '../../../src/images/login/passoff.png';
 import axios from 'axios';
 import DragValidatortwo from '../../../src/common/components/DragValidatortwo'
 import './common.css'
+import './commontwo.css'
 const { TabPane } = Tabs;
 const loginInputsyl = {
 "width":"434px",
@@ -36,7 +37,7 @@ class LoginRegisterComponent extends Component {
                 classpass: "text",
                 // 登录
                 passopens: passoff,
-                seconds: 35,
+                seconds: 60,
                 discodeBtn: false,
                 clearInterval: false,
                 autoLogin: true,
@@ -71,7 +72,7 @@ class LoginRegisterComponent extends Component {
                 classpass: "text",
                 // 登录
                 passopens: passoff,
-                seconds: 35,
+                seconds: 60,
                 discodeBtn: false,
                 clearInterval: false,
                 autoLogin: true,
@@ -528,7 +529,7 @@ class LoginRegisterComponent extends Component {
                         clearInterval(timer);
                         this.setState({
                             getverificationcodes: false,
-                            seconds: 35,
+                            seconds: 60,
                         })
                     }
                 });
@@ -546,7 +547,7 @@ class LoginRegisterComponent extends Component {
                         clearInterval(timer);
                         this.setState({
                             getverificationcodes: false,
-                            seconds: 35,
+                            seconds: 60,
 
                         })
                     }
@@ -718,7 +719,7 @@ class LoginRegisterComponent extends Component {
         console.log(classpass);
         return (
 
-            <div className="login_register_content login_register_contents" style={  parseInt(tab[0])==0?{height: "346px"} :{height: "490px"}}>
+            <div className="login_register_content login_register_contents" style={  parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}>
                 <style>
                     {
                         `
@@ -731,7 +732,7 @@ class LoginRegisterComponent extends Component {
                 </style>
 
                 <div>
-                    <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
+                    <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
                         <Menu.Item key="0" className={tab===0?"active font-18":"font-18"}   > 登录</Menu.Item>
                         <Menu.Item key="1" className={tab===1?"active font-18":"font-18"}  >注册</Menu.Item>
                     </Menu>
@@ -839,8 +840,9 @@ class LoginRegisterComponent extends Component {
                                 Whethertoverify===false&&pciphone===true?
                                   <DragValidator
                                     height={38}  successGreenColor="#29bd8b"
-                                    style={{ height: '38px'}}
+                                    style={{ height: '38px',width: "100%"}}
                                     dragOkCallback={this.dragOkCallback}
+																		className="ysllw100"
                                   ></DragValidator>
                                   :
                                ""
@@ -850,8 +852,9 @@ class LoginRegisterComponent extends Component {
                                 Whethertoverify===true&&pciphone===true?
                                 <DragValidatortwo
                                   height={38}  successGreenColor="#29bd8b"
-                                  style={{ height: '38px'}}
+                                  style={{ height: '38px',width: "100%"}}
                                   dragOkCallback={this.dragOkCallback}
+																	className="ysllw100"
                                 ></DragValidatortwo>
                                 :
                                 ""
diff --git a/public/react/src/modules/user/commontwo.css b/public/react/src/modules/user/commontwo.css
index d25b888c8..ee43d5834 100644
--- a/public/react/src/modules/user/commontwo.css
+++ b/public/react/src/modules/user/commontwo.css
@@ -270,4 +270,7 @@
 .bth100{
     width: 100px;
     margin: 0 auto;
+}
+.ysllw100{
+    width: 100%;
 }
\ No newline at end of file