diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index ec77f7e97..ed129d8bd 100755 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -235,13 +235,16 @@ class CompetitionCommon extends Component{ this.props.showProfileCompleteDialog() return } + if(url===undefined){ let {data,signupdata}=this.state; - if(signupdata.enrolled===true){ - this.props.history.replace(`/courses/${data.course_id}`); - }else{ + // if(signupdata.enrolled===true){ + // this.props.history.replace(`/courses/${data.course_id}`); + // }else{ } + if (data.member_of_course === true) { - this.props.history.replace(`/courses/${data.course_id}`); + // this.props.history.replace(`/courses/${data.course_id}`); + window.open(`/courses/${data.course_id}`) } else { // 以学生身份调用加入课堂 进入课堂首页 let url = "/courses/apply_to_join_course.json" @@ -251,15 +254,18 @@ class CompetitionCommon extends Component{ } ).then((response) => { if (response.data.status === 0) { - this.props.history.replace(`/courses/${data.course_id}`); + // this.props.history.replace(); + this.Personalregistration(`/courses/${data.course_id}`) } }) + } - } + }else{ if (url === "personal") { - this.Personalregistration() + let urls = `/competitions/${this.props.match.params.identifier}/enroll`; + this.Personalregistration(urls) } else { this.props.history.replace(url); } @@ -268,10 +274,10 @@ class CompetitionCommon extends Component{ } - Personalregistration = () => { + Personalregistration = (urls) => { let {signupdata} = this.state; - let urls = `/competitions/${this.props.match.params.identifier}/enroll`; + if (signupdata.enroll_ended === true) { //已截止 this.props.showNotification(`报名已截止`); @@ -286,7 +292,8 @@ class CompetitionCommon extends Component{ if (response) { if (response.data) { this.props.showNotification(`报名成功,预祝您夺得桂冠!`); - this.props.history.replace(urls); + // this.props.history.replace(urls); + window.open(urls) } } }).catch((error) => {