From bb3711d8c42fee1cfb7d5327d38f839a01dab68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 6 Nov 2019 13:36:48 +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 --- .../Competitioncommon/CompetitionCommon.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 2bb4585db..c350577d9 100755 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -238,24 +238,28 @@ class CompetitionCommon extends Component{ if(url===undefined){ let {data,signupdata}=this.state; if(signupdata.enrolled===true){ - this.props.history.replace(`/courses/${data.course_id}`); - }else{ //课堂学生不需要在竞赛报名的 - if(data.member_of_course===true){ + if (data.member_of_course === true) { this.props.history.replace(`/courses/${data.course_id}`); - }else{ + } else { // 以学生身份调用加入课堂 进入课堂首页 - let url="/courses/apply_to_join_course.json" + let url = "/courses/apply_to_join_course.json" axios.post(url, { - invite_code: data.invite_code, - student:1 + invite_code: data.invite_code, + student: 1 } ).then((response) => { - if(response.data.status===0){ + if (response.data.status === 0) { this.props.history.replace(`/courses/${data.course_id}`); } }) } + }else{ + if (signupdata.personal === true) { + this.Personalregistration() + } else { + this.props.history.replace(`/competitions/${this.props.match.params.identifier}/enroll`); + } } }else{