diff --git a/public/react/src/App.js b/public/react/src/App.js index 69bd33f57..5988d3532 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -486,7 +486,14 @@ class App extends Component { {/*/!*众包创新*!/*/} {/**/} {/*竞赛*/} - + { + + return () + } + }> + {/*认证*/} diff --git a/public/react/src/modules/competition/Registration.js b/public/react/src/modules/competition/Registration.js index 5591d68c5..3c50647ce 100644 --- a/public/react/src/modules/competition/Registration.js +++ b/public/react/src/modules/competition/Registration.js @@ -76,6 +76,15 @@ class Registration extends React.Component { // //// //////console.log("调用子组件 "); // //////console.log(this.props.isAdmin()); // //// //////console.log(this.props.isAdmin()) + try { + const {keyword, page, per_page} = this.state; + this.Getdata(keyword, page, per_page, this.props.user.admin); + this.GetenrollmentAPI(); + } catch (e) { + // const {keyword, page, per_page} = this.state; + // this.Getdata(keyword, page, per_page, this.props.isAdmin()); + // this.GetenrollmentAPI(); + } } componentDidUpdate = (prevProps) => { @@ -88,8 +97,6 @@ class Registration extends React.Component { const {keyword, page, per_page} = this.state; this.Getdata(keyword, page, per_page, this.props.user.admin); this.GetenrollmentAPI(); - - } } @@ -388,7 +395,7 @@ class Registration extends React.Component { }) return } - if (this.props.isAdmin() === true) { + if (this.props.user.admin === true) { //老师 if (this.state.teacher_staff === null) { //禁止老师 @@ -442,7 +449,7 @@ class Registration extends React.Component { }) return } - if (this.props.isAdmin() === true) { + if (this.props.user.admin === true) { //老师 if (this.state.teacher_staff === null) { //禁止老师 @@ -704,10 +711,13 @@ class Registration extends React.Component { {/* 报名*/} {/*

*/} {/**/} - - 在线竞赛 - 全国高校计算机大赛 - +
+ + 在线竞赛 + 全国高校计算机大赛 + 报名 + +
{/*大图*/} this.Jointheteam()} pint={pint} @@ -722,7 +732,8 @@ class Registration extends React.Component {
-

参赛总人数:{data === null || data === undefined ? 0 : data.length}人 +

参赛总人数:{data === null || data === undefined ? 0 : data.length}

: ""} diff --git a/public/react/src/modules/competition/RegistrationSearch.js b/public/react/src/modules/competition/RegistrationSearch.js index 3d3019e95..122366e0d 100644 --- a/public/react/src/modules/competition/RegistrationSearch.js +++ b/public/react/src/modules/competition/RegistrationSearch.js @@ -62,7 +62,8 @@ class RegistrationSearch extends React.Component { textAlign: "right", lineHeight: " 24px" }}>战队总数:{this.props.count}

+ style={{color: "#459BE5", fontSize: "16px"}}>{this.props.count}

) } diff --git a/public/react/src/modules/competition/comcss/competition.css b/public/react/src/modules/competition/comcss/competition.css index 2b3070ad4..102f2492d 100644 --- a/public/react/src/modules/competition/comcss/competition.css +++ b/public/react/src/modules/competition/comcss/competition.css @@ -365,11 +365,13 @@ width: 78px; background-color: transparent; margin-bottom: 9px; + border-radius: 50%; } .personregitemimg { height: 64px; width: 64px; + border-radius: 50%; } @@ -384,13 +386,17 @@ height: 69px; margin-top: 3px; background-color: transparent; + border-radius: 50%; + } .regitemimgs2 { margin-top: 16px; width: 49px; height: 51px; - margin-left: 25px + margin-left: 25px; + border-radius: 50%; + } .regitemimgs22 { @@ -398,6 +404,8 @@ width: 28px; height: 28px; margin-left: 20px; + border-radius: 50%; + } .regitemimgs3 { diff --git a/public/react/src/modules/competition/competmodal/PersonModal.js b/public/react/src/modules/competition/competmodal/PersonModal.js index 7ee726f53..d59a9185b 100644 --- a/public/react/src/modules/competition/competmodal/PersonModal.js +++ b/public/react/src/modules/competition/competmodal/PersonModal.js @@ -56,7 +56,24 @@ class PersonModal extends Component { } } componentDidMount() { - + var data = []; + var datas = { + enrollable: false, + id: this.props.user.user_id, + name: this.props.user.real_name, + school_name: this.props.user.user_school, + student_id: null, + identity: this.props.user.user_identity, + type: "创建者", + }; + data.push(datas); + this.setState({ + myuser: this.props.user, + mydatas: data, + }) + this.setState({ + GetenrollmentAPI: this.props.GetenrollmentAPI, + }) } componentDidUpdate = (prevProps) => { diff --git a/public/react/src/modules/competition/personal/PersonalCompetit.js b/public/react/src/modules/competition/personal/PersonalCompetit.js index b14ad4d36..d740e416a 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetit.js +++ b/public/react/src/modules/competition/personal/PersonalCompetit.js @@ -58,7 +58,7 @@ class PersonalCompetit extends React.Component {
-

参赛总人数:132

+

参赛总人数:132

: ""} diff --git a/public/react/src/modules/competition/personal/PersonalCompetititem.js b/public/react/src/modules/competition/personal/PersonalCompetititem.js index d7830b969..3b70190fa 100644 --- a/public/react/src/modules/competition/personal/PersonalCompetititem.js +++ b/public/react/src/modules/competition/personal/PersonalCompetititem.js @@ -148,10 +148,14 @@ class PersonalCompetititem extends React.Component { fontSize: "16px", }}>{data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code} - +
+ +
{data[0].invite_code === null || data[0].invite_code === undefined ?