diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index 4868171a1..845caacbc 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -247,9 +247,9 @@ class Testpapersettinghomepage extends Component{

- this.gotohome()}>{this.props.coursedata.name} + this.gotohome()}>{this.props.coursedata.name} > - 试卷 + 试卷 > 试卷详情

diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index cf415aa28..0c4109ceb 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2319,7 +2319,14 @@ class PollNew extends Component { } } - + 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 { @@ -2373,19 +2380,18 @@ class PollNew extends Component { /> : ""}

- {this.props.coursedata.name} + this.gotohome()}>{this.props.coursedata.name} > - 问卷 + 问卷 > {this.props.match.params.news === undefined ? "新建" : this.props.match.params.news === "new" ? "新建" : "编辑"}

{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}

- 返回 + this.gotohome()} + className=" fr font-16">返回
{/*
*/} diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js index af8bda0dc..b40cb3536 100644 --- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js +++ b/public/react/src/modules/courses/shixunHomework/CommitSummary.js @@ -70,7 +70,14 @@ class CommitSummary extends Component{ const mdContnet = this.refs[`md${1}`].getValue().trim(); console.log(mdContnet) } - + 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); + } + } asdasdsad=()=>{ this.setState({ contents:"" @@ -123,20 +130,19 @@ class CommitSummary extends Component{ }} >

- {data === undefined ? "" :data.course_name===undefined?"": data.course_name} + this.gotohome()}>{data === undefined ? "" :data.course_name===undefined?"": data.course_name} > - {data === undefined ? "" :data.category===undefined?"":data.category.category_name} + {data === undefined ? "" :data.category===undefined?"":data.category.category_name} > - 作业详情 + 作业详情

修改总结

- 返回 + this.gotohome()} className="color-grey-6 fr font-16 ml30 mt10">返回
{/*educontentbox*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 9b053f03b..e2285a7a6 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -132,11 +132,11 @@ class ShixunHomeworkPage extends Component {

- this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} + this.gotohome()}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name} > - {jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name} + href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name} > 作业详情

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js index 3c2367942..91f6f3001 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js @@ -101,6 +101,14 @@ class ShixunWorkReport extends Component { } } } + 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{data} =this.state; let category_id=data===undefined?"":data.category===null?"":data.category.category_id; @@ -119,16 +127,15 @@ class ShixunWorkReport extends Component { modalsType={this.state.DownloadType} />

- - + this.gotohome()}> {data&&data.course_name} - + > - + {data===undefined?"":data.category===null?"":data.category.category_name} - + > - 作业详情 + 作业详情 > {data&&data.username}

diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 504dd9c57..61133acd2 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -875,6 +875,14 @@ class ShixunHomework extends Component{ let data={id:parseInt(datas.category_id),name:name} trigger('editshixunname', data) } + 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 { modalname, diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js index ff3eba33d..b27fe8cec 100644 --- a/public/react/src/modules/user/LoginRegisterComponent.js +++ b/public/react/src/modules/user/LoginRegisterComponent.js @@ -46,7 +46,7 @@ class LoginRegisterComponent extends Component { readAgreement: false, getverificationcodes: true, dragOk: false, - Agreetotheterms: false, + Agreetotheterms: true, login: "", password: "", logins: "", @@ -81,7 +81,7 @@ class LoginRegisterComponent extends Component { readAgreement: false, getverificationcodes: true, dragOk: false, - Agreetotheterms: false, + Agreetotheterms: true, login: "", password: "", logins: "", @@ -944,7 +944,7 @@ class LoginRegisterComponent extends Component { } 我已阅读并同意