From 5d1b015b51512626cacce69b868776d17813f65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 18:00:07 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 115 +++++++++++----------- 1 file changed, 58 insertions(+), 57 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 537489f8f..160128f77 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -114,16 +114,15 @@ class NewHeader extends Component { // // } } + openNotification = (messge) => { notification.open({ message: "提示", description: messge, - onClick: () => { - console.log('Notification Clicked!'); - }, }); }; + componentWillReceiveProps(newProps, oldProps) { this.setState({ user:newProps.user @@ -408,58 +407,58 @@ submittojoinclass=(value)=>{ return } - if(value===0){ - let url="/courses/join_course_multi_role.json" - const form = new FormData(); - form.append('invite_code', tojoinclasstitle); - form.append('role', pamst); - form.append('type', 1); - axios.post(url,form,[true] - ).then((response) => { - if( response.data.state===0){ - this.submitstatevalue(0,"加入成功",response.data.course_id) - }else if( response.data.state===1){ - }else if( response.data.state===2){ - this.submitstatevalue( 0,"课堂已过期! 请联系课堂管理员重启课堂。(在配置课堂处)") - }else if( response.data.state===3){ - this.submitstatevalue( 0,"您已是课堂成员)",response.data.course_id) - }else if( response.data.state===4){ - this.submitstatevalue( 0,"您输入的邀请码错误)") - }else if( response.data.state===5){ - this.submitstatevalue( 0,"您还未登录") - }else if( response.data.state===6){ - this.submitstatevalue( 0,"申请已提交，请等待审核") - }else if( response.data.state===7){ - this.submitstatevalue( 0," 您已经发送过申请了，请耐心等待") - }else if( response.data.state===8){ - this.submitstatevalue( 0,"您已经是该课堂的教师了",response.data.course_id) - }else if( response.data.state==9){ - this.submitstatevalue( 0,"您已经是该课堂的教辅了",response.data.course_id) - }else if( response.data.state==10){ - this.submitstatevalue(0,"您已经是该课堂的管理员了",response.data.course_id) - }else if( response.data.state==11){ - this.submitstatevalue(0," 该课堂已归档，请联系老师") - }else if( response.data.state==12){ - this.submitstatevalue(0,"您已经发送过申请了，请耐心等待师") - }else if( response.data.state==13){ - this.submitstatevalue(0,"您申请已提交，请等待审核") - }else if( response.data.state==14){ - this.submitstatevalue("此邀请码已停用，请与老师联系") - }else if( response.data.state==15){ - this.submitstatevalue(0,"您已是课堂成员! 加入分班请在课堂具体分班页面进行") - }else { - this.submitstatevalue(0," 未知错误，请稍后再试") - } - }) - - } + // if(value===0){ + // let url="/courses/join_course_multi_role.json" + // const form = new FormData(); + // form.append('invite_code', tojoinclasstitle); + // form.append('role', pamst); + // form.append('type', 1); + // axios.post(url,form,[true] + // ).then((response) => { + // if( response.data.state===0){ + // this.submitstatevalue(0,"加入成功",response.data.course_id) + // }else if( response.data.state===1){ + // }else if( response.data.state===2){ + // this.submitstatevalue( 0,"课堂已过期! 请联系课堂管理员重启课堂。(在配置课堂处)") + // }else if( response.data.state===3){ + // this.submitstatevalue( 0,"您已是课堂成员)",response.data.course_id) + // }else if( response.data.state===4){ + // this.submitstatevalue( 0,"您输入的邀请码错误)") + // }else if( response.data.state===5){ + // this.submitstatevalue( 0,"您还未登录") + // }else if( response.data.state===6){ + // this.submitstatevalue( 0,"申请已提交，请等待审核") + // }else if( response.data.state===7){ + // this.submitstatevalue( 0," 您已经发送过申请了，请耐心等待") + // }else if( response.data.state===8){ + // this.submitstatevalue( 0,"您已经是该课堂的教师了",response.data.course_id) + // }else if( response.data.state==9){ + // this.submitstatevalue( 0,"您已经是该课堂的教辅了",response.data.course_id) + // }else if( response.data.state==10){ + // this.submitstatevalue(0,"您已经是该课堂的管理员了",response.data.course_id) + // }else if( response.data.state==11){ + // this.submitstatevalue(0," 该课堂已归档，请联系老师") + // }else if( response.data.state==12){ + // this.submitstatevalue(0,"您已经发送过申请了，请耐心等待师") + // }else if( response.data.state==13){ + // this.submitstatevalue(0,"您申请已提交，请等待审核") + // }else if( response.data.state==14){ + // this.submitstatevalue("此邀请码已停用，请与老师联系") + // }else if( response.data.state==15){ + // this.submitstatevalue(0,"您已是课堂成员! 加入分班请在课堂具体分班页面进行") + // }else { + // this.submitstatevalue(0," 未知错误，请稍后再试") + // } + // }) + // + // } if(value===1){ - let url="/api/applied_project/applied_project_info.json" + let url="/api/applied_projects.json" const form = new FormData(); - form.append('invite_code', tojoinclasstitle); - form.append('member', RadioGroupvalue); - form.append('type', 1); + form.append('code', tojoinclasstitle); + form.append('role', RadioGroupvalue); + // form.append('type', 1); axios.post(url,form,[true] ).then((response) => { if( response.data.status===1){ @@ -474,7 +473,9 @@ submittojoinclass=(value)=>{ this.submitstatevalue( 1,"您已经申请加入该项目了，请耐心等待") }else if( response.data.status===6){ this.submitstatevalue( 1,"您已成功加入项目",response.data.project) - } + }else if( response.data.status===0){ + this.openNotification("加入项目成功!"); + } }) } } @@ -869,7 +870,7 @@ submittojoinclass=(value)=>{ {/* /courses/join_course_multi_role */} {/*
  • */} - 加入项目 + 加入项目 {/*
    • */} { - 管理人员 - 开发人员 - 报告人员 + 管理人员 + 开发人员 + 报告人员 From 649b6f7b2c96264a9c56ccdd2a15545843d74528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 18:20:54 +0800 Subject: [PATCH 2/6] b --- public/react/src/modules/tpm/NewHeader.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 160128f77..ba502df7b 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -455,11 +455,14 @@ submittojoinclass=(value)=>{ if(value===1){ let url="/api/applied_projects.json" - const form = new FormData(); - form.append('code', tojoinclasstitle); - form.append('role', RadioGroupvalue); + // const form = new FormData(); + // form.append('code', tojoinclasstitle); + // form.append('role', RadioGroupvalue); // form.append('type', 1); - axios.post(url,form,[true] + axios.post(url,{ + code:tojoinclasstitle, + role:RadioGroupvalue + } ).then((response) => { if( response.data.status===1){ this.submitstatevalue(1,"您输入的邀请码错误") From 058bc1d45baf1254df18b3dd7fa74b8dc266f9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 18:22:22 +0800 Subject: [PATCH 3/6] b --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index ba502df7b..254ca7566 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -454,7 +454,7 @@ submittojoinclass=(value)=>{ // } if(value===1){ - let url="/api/applied_projects.json" + let url="/api/project_applies.json" // const form = new FormData(); // form.append('code', tojoinclasstitle); // form.append('role', RadioGroupvalue); From e3c73014cb09c57071dd7545ed085606f7f72d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 18:26:59 +0800 Subject: [PATCH 4/6] b --- public/react/src/modules/tpm/NewHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 254ca7566..9ff819c66 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -454,7 +454,7 @@ submittojoinclass=(value)=>{ // } if(value===1){ - let url="/api/project_applies.json" + let url="/project_applies.json" // const form = new FormData(); // form.append('code', tojoinclasstitle); // form.append('role', RadioGroupvalue); From 884701144a72a11677e7d421e9b605ea3894b2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 18:35:36 +0800 Subject: [PATCH 5/6] b --- public/react/src/modules/tpm/NewHeader.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 9ff819c66..45e4acc4a 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -478,9 +478,11 @@ submittojoinclass=(value)=>{ this.submitstatevalue( 1,"您已成功加入项目",response.data.project) }else if( response.data.status===0){ this.openNotification("加入项目成功!"); + window.location.href(`/projects/${response.data.project_id}`) } }) } + this.hidetojoinclass() } // trialapplications =()=>{ @@ -908,7 +910,7 @@ submittojoinclass=(value)=>{

    请至少选择一个身份

    + style={{marginLeft: '90px',display:checked_notice===true?'block':"none"}}>请选择一个身份

  • Date: Wed, 31 Jul 2019 19:02:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 45e4acc4a..2c07bc744 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -477,8 +477,12 @@ submittojoinclass=(value)=>{ }else if( response.data.status===6){ this.submitstatevalue( 1,"您已成功加入项目",response.data.project) }else if( response.data.status===0){ - this.openNotification("加入项目成功!"); - window.location.href(`/projects/${response.data.project_id}`) + if(RadioGroupvalue==="reporter"){ + this.openNotification("您加入项目成功!"); + window.location.href=`/projects/${response.data.project_id}`; + }else{ + this.openNotification("您的申请已提交，请等待项目管理员审批!"); + } } }) } @@ -877,7 +881,7 @@ submittojoinclass=(value)=>{ {/*
  • */} 加入项目 {/*
    • */} - { - +     :""}