From f07b44a02893df869ffbdb297aa7e22526b2bd6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 26 Oct 2019 14:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/competition/Registration.js | 86 ++++++++++++------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index f66a89662..66f98e56f 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -252,9 +252,7 @@ class Registration extends React.Component { } } else { //有数据的 - if (admin === true) { - if (result.data.my_teams[0].manage_permission === true) { this.setState({ type: 5, data: result.data.my_teams, @@ -263,24 +261,8 @@ class Registration extends React.Component { personal: result.data.personal, competition_name: result.data.competition_name, members_count: result.data.members_count - - }) - } else { - this.setState({ - type: 4, - data: result.data.my_teams, - count: result.data.count, - competition_teams: result.data.competition_teams, - personal: result.data.personal, - competition_name: result.data.competition_name, - members_count: result.data.members_count - - - }) - } } else { - if (result.data.my_teams[0].manage_permission === true) { //普通账号true 为创建了竞赛 this.setState({ type: 2, @@ -289,22 +271,7 @@ class Registration extends React.Component { personal: result.data.personal, competition_name: result.data.competition_name, members_count: result.data.members_count - - - }) - } else { - //普通账号true 加入了竞赛 - this.setState({ - type: 3, - data: result.data.my_teams, - count: result.data.count, - personal: result.data.personal, - competition_name: result.data.competition_name, - members_count: result.data.members_count - - }) - } } } @@ -975,3 +942,56 @@ class Registration extends React.Component { } export default Registration; + + +// if (admin === true) { +// // if (result.data.my_teams[0].manage_permission === true) { +// this.setState({ +// type: 5, +// data: result.data.my_teams, +// count: result.data.count, +// competition_teams: result.data.competition_teams, +// personal: result.data.personal, +// competition_name: result.data.competition_name, +// members_count: result.data.members_count +// +// +// }) +// // } else { +// // this.setState({ +// // type: 4, +// // data: result.data.my_teams, +// // count: result.data.count, +// // competition_teams: result.data.competition_teams, +// // personal: result.data.personal, +// // competition_name: result.data.competition_name, +// // members_count: result.data.members_count +// // +// // +// // }) + +// if (result.data.my_teams[0].manage_permission === true) { +//普通账号true 为创建了竞赛 +// this.setState({ +// type: 2, +// data: result.data.my_teams, +// count: result.data.count, +// personal: result.data.personal, +// competition_name: result.data.competition_name, +// members_count: result.data.members_count +// +// +// }) +// } else { +// //普通账号true 加入了竞赛 +// this.setState({ +// type: 2, +// data: result.data.my_teams, +// count: result.data.count, +// personal: result.data.personal, +// competition_name: result.data.competition_name, +// members_count: result.data.members_count +// +// +// }) +// } \ No newline at end of file