From 41fd8013cb1f81f3e1d3ed5061bdf8a9d4b0cbe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 25 Jul 2019 11:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Testpapersettinghomepage.js | 26 +++++++------------ .../shixunHomework/ShixunHomeworkPage.js | 15 +++++++---- .../react/src/modules/login/EducoderLogin.js | 5 +++- public/react/src/modules/tpm/NewHeader.js | 2 +- .../src/modules/user/FindPasswordComponent.js | 9 ++++--- .../modules/user/LoginRegisterComponent.js | 19 ++++++++------ public/react/src/modules/user/commontwo.css | 3 +++ 7 files changed, 45 insertions(+), 34 deletions(-) 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{

- {this.props.coursedata.name} + this.gotohome()}>{this.props.coursedata.name} > 试卷 > @@ -274,9 +270,7 @@ class Testpapersettinghomepage extends Component{ - 返回 + this.gotohome()}>返回

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 {

- {jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} + this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} > - 返回 + this.gotohome()}>返回 实训详情 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%" }}>

- + this.gohome()} src={educodernet}/>
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} />
:""} 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" > : "" @@ -611,6 +613,7 @@ class LoginRegisterComponent extends Component { height={38} successGreenColor="#29bd8b" style={{height: "38px", width: "100%"}} dragOkCallback={()=>this.dragOkCallback()} + className="ysllw100" > : "" 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 ( -
+
- + 登录 注册 @@ -839,8 +840,9 @@ class LoginRegisterComponent extends Component { Whethertoverify===false&&pciphone===true? : "" @@ -850,8 +852,9 @@ class LoginRegisterComponent extends Component { Whethertoverify===true&&pciphone===true? : "" 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