m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_sync_trustie
杨树明 6 years ago
parent 7fc454eb05 e51312f005
commit 96ae845e89
3 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File

11
public/react/src/modules/competition/Registration.js
Unescape View File

@ -512,7 +512,7 @@ class Registration extends React.Component {
}) })
return return
} }
if (this.props.user.admin === true) { if (this.props.user.is_teacher === true) {
//老师 //老师
if (this.state.teacher_staff === null) { if (this.state.teacher_staff === null) {
//禁止老师 //禁止老师
@ -793,9 +793,16 @@ class Registration extends React.Component {
{/*普通账号出现单人 战队弹框*/} {/*普通账号出现单人 战队弹框*/}
{ {
type === 2 || type === 3 || type === 5 ? type === 2 || type === 3 || type === 5 ?
<PersonalCompetititem type={type} data={data} (
data && data.map((item, index) => {
return (
<PersonalCompetititem key={index} type={type} item={item}
Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)} Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)}
Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem> Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem>
)
})
)
: "" : ""
} }

7
public/react/src/modules/competition/comcss/competition.css
Unescape View File

@ -309,6 +309,13 @@
margin-top: 44px; margin-top: 44px;
} }
.myregitem11 {
display: flex;
flex-direction: initial;
margin-top: 20px;
}
.regitem22 { .regitem22 {
display: flex; display: flex;
flex-direction: initial; flex-direction: initial;

56
public/react/src/modules/competition/personal/PersonalCompetititem.js
Unescape View File

@ -33,17 +33,13 @@ function codesuccess() {
class PersonalCompetititem extends React.Component { class PersonalCompetititem extends React.Component {
constructor(props) { constructor(props) {
super(props) super(props)
this.state = {
data: ""
}
} }
componentDidMount() { componentDidMount() {
// // ////console.log(this.props.data) // // ////console.log(this.props.data)
this.setState({
data: this.props.data,
})
} }
@ -55,7 +51,7 @@ class PersonalCompetititem extends React.Component {
} }
render() { render() {
const {data} = this.props; const {key, item} = this.props;
// ////console.log("PersonalCompetititem"); // ////console.log("PersonalCompetititem");
// ////console.log(data); // ////console.log(data);
// ////console.log(data[0]); // ////console.log(data[0]);
@ -68,12 +64,14 @@ class PersonalCompetititem extends React.Component {
return ( return (
<div> <div>
{ {
data && data[0] ? <div className={"yslborderbottom"}> item !== undefined || item !== null ? <div className={"yslborderbottom"}>
<div className="regitem" style={{ <div
className={this.props.key === undefined || this.props.key === null ? "myregitem11" : this.props.key === 0 ? "regitem" : "myregitem11"}
style={{
marginBottom: "19px", marginBottom: "19px",
}}> }}>
<div className="regitemimg1 "> <div className="regitemimg1 ">
<img className="regitemimg2" src={getImageUrl("images/" + data[0].creator.image_url)}> <img className="regitemimg2" src={getImageUrl("images/" + item.creator.image_url)}>
</img> </img>
<p className="" style={{ <p className="" style={{
@ -82,7 +80,7 @@ class PersonalCompetititem extends React.Component {
width: "78px", width: "78px",
textAlign: "center" textAlign: "center"
}}>{data[0].creator.name}</p> }}>{item.creator.name}</p>
</div> </div>
<div className=" " style={{ <div className=" " style={{
marginTop: "29px", marginTop: "29px",
@ -94,7 +92,7 @@ class PersonalCompetititem extends React.Component {
fontSize: "16px", fontSize: "16px",
width: "160px", width: "160px",
textAlign: "center" textAlign: "center"
}}>{data[0].name}</p> }}>{item.name}</p>
</div> </div>
{this.props.type === 5 || this.props.type === 2 ? {this.props.type === 5 || this.props.type === 2 ?
<div className=" " style={{ <div className=" " style={{
@ -104,7 +102,7 @@ class PersonalCompetititem extends React.Component {
width: "357px" width: "357px"
}}> }}>
{ {
data && data[0].team_members.map((item, index) => { item && item.team_members.map((item, index) => {
return ( return (
index === 0 ? index === 0 ?
@ -143,7 +141,7 @@ class PersonalCompetititem extends React.Component {
width: "487px" width: "487px"
}}> }}>
{ {
data && data[0].team_members.map((item, index) => { item && item.team_members.map((item, index) => {
return ( return (
index === 0 ? index === 0 ?
@ -199,7 +197,7 @@ class PersonalCompetititem extends React.Component {
color: "#05101A", color: "#05101A",
fontSize: "16px", fontSize: "16px",
}}>{data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code}</span> }}>{item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}</span>
</div> </div>
<div style={{ <div style={{
overflow: 'hidden', overflow: 'hidden',
@ -207,10 +205,10 @@ class PersonalCompetititem extends React.Component {
width: "1px" width: "1px"
}}> }}>
<input id="copy_invite_code" <input id="copy_invite_code"
value={data[0].invite_code === null || data[0].invite_code === undefined ? "" : data[0].invite_code}/> value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}/>
</div> </div>
</div> </div>
{data[0].invite_code === null || data[0].invite_code === undefined ? {item.invite_code === null || item.invite_code === undefined ?
<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n" <i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
style={{ style={{
marginLeft: "18px", marginLeft: "18px",
@ -239,18 +237,18 @@ class PersonalCompetititem extends React.Component {
}} }}
> >
<div className="regitemimgs555"> <div className="regitemimgs555">
<a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${data[0].id}`} style={{ <a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{
color: "#459be5", color: "#459be5",
width: "100%", width: "100%",
height: "100%", height: "100%",
lineHeight: "39px", lineHeight: "39px",
}}>战队详情</a> }}>战队详情</a>
</div> </div>
<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(data[0].id, false)}> <div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(data[0].id, false)}>删除战队</p> <p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
</div> </div>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(data[0])}> <div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
<p onClick={() => this.props.Createateamedit(data[0])}>编辑战队</p> <p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div> </div>
</div> </div>
@ -262,18 +260,18 @@ class PersonalCompetititem extends React.Component {
> >
<div className="regitemimgs555"> <div className="regitemimgs555">
<a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${data[0].id}`} style={{ <a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{
color: "#459be5", color: "#459be5",
width: "100%", width: "100%",
height: "100%", height: "100%",
lineHeight: "39px", lineHeight: "39px",
}}>战队详情</a> }}>战队详情</a>
</div> </div>
<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(data[0].id, false)}> <div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(data[0].id, false)}>删除战队</p> <p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
</div> </div>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(data[0])}> <div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
<p onClick={() => this.props.Createateamedit(data[0])}>编辑战队</p> <p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div> </div>
</div> </div>
: :
@ -284,8 +282,8 @@ class PersonalCompetititem extends React.Component {
}} }}
> >
<div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(data[0].id, false)}> <div className="regitemimgs6" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(data[0].id, false)}>退出战队</p> <p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save