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

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_sync_trustie
cxt 5 years ago
parent 46e2e573e3 b9be6b1dc5
commit b042f366ae
2 changed files with 201 additions and 82 deletions
Show Stats Download Patch File Download Diff File

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

@ -67,6 +67,7 @@ class Registration extends React.Component {
mutiple_limited: false, mutiple_limited: false,
teamutiple_limited: false, teamutiple_limited: false,
members_count: 0, members_count: 0,
mode: 0
} }
} }
@ -87,6 +88,7 @@ class Registration extends React.Component {
// this.Getdata(keyword, page, per_page, this.props.isAdmin()); // this.Getdata(keyword, page, per_page, this.props.isAdmin());
// this.GetenrollmentAPI(); // this.GetenrollmentAPI();
} }
this.Getdataheader();
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps) => {
@ -103,6 +105,25 @@ class Registration extends React.Component {
} }
// 获取数据头部
Getdataheader = () => {
const url = `/competitions/${this.props.match.params.identifier}/common_header.json`;
axios.get((url)).then((result) => {
if (result) {
if (result.data) {
this.setState({
mode: result.data.mode,
})
}
}
}).catch((error) => {
})
}
//获取报名配置API //获取报名配置API
GetenrollmentAPI = () => { GetenrollmentAPI = () => {
// console.log("调用了GetenrollmentAPI"); // console.log("调用了GetenrollmentAPI");
@ -524,6 +545,7 @@ class Registration extends React.Component {
**/ **/
Createateam = () => { Createateam = () => {
// //
if (this.props.user.is_teacher === true) { if (this.props.user.is_teacher === true) {
try { try {
if (this.props.teamutiple_limited === true) { if (this.props.teamutiple_limited === true) {
@ -736,7 +758,7 @@ class Registration extends React.Component {
render() { render() {
const {page, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited, members_count} = this.state; const {page, mode, pages, limit, type, tmodalsType, tmodalsTypes, data, count, competition_teams, Newtit, itemiddata, messagePerbool, messageexitol, GetenrollmentAPI, loadingstate, pint, competition_name, mutiple_limited, teamutiple_limited, members_count} = this.state;
return ( return (
<div className="newMain clearfix newMainybot"> <div className="newMain clearfix newMainybot">
@ -849,7 +871,7 @@ class Registration extends React.Component {
( (
data && data.map((item, index) => { data && data.map((item, index) => {
return ( return (
<PersonalCompetititem key={index} type={type} item={item} index={index} <PersonalCompetititem key={index} type={type} item={item} index={index} mode={mode}
Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)} Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)}
Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem> Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem>
) )

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

@ -11,8 +11,8 @@ import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
import competition from '../comcss/competition.css'; import competition from '../comcss/competition.css';
import {Button, message, Tooltip} from 'antd'; import {Button, message, Tooltip} from 'antd';
// 点击按钮复制功能 // 点击按钮复制功能
function jsCopy() { function jsCopy(s) {
var e = document.getElementById("copy_invite_code"); var e = document.getElementById(s);
e.select(); e.select();
document.execCommand("Copy"); document.execCommand("Copy");
codesuccess() codesuccess()
@ -51,7 +51,7 @@ class PersonalCompetititem extends React.Component {
} }
render() { render() {
const {key, item} = this.props; const {key, item, type, mode} = this.props;
// ////console.log("PersonalCompetititem"); // ////console.log("PersonalCompetititem");
// ////console.log(data); // ////console.log(data);
// ////console.log(data[0]); // ////console.log(data[0]);
@ -61,6 +61,10 @@ class PersonalCompetititem extends React.Component {
// ); // );
// console.log("PersonalCompetititem"); // console.log("PersonalCompetititem");
// console.log(data); // console.log(data);
console.log("PersonalCompetititem");
console.log(type);
console.log(mode);
return ( return (
<div> <div>
{ {
@ -95,45 +99,97 @@ class PersonalCompetititem extends React.Component {
}}>{item.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={{ (this.props.mode === 3 ?
marginLeft: "37px", <div style={{
display: "flex", marginLeft: "37px",
flexDirection: "initial", display: "flex",
width: "357px" flexDirection: "initial",
}}> width: "357px"
{ }}>
item && item.team_members.map((item, index) => { {
return ( item && item.team_members.map((item, index) => {
return (
index === 0 ?
<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
index === 0 ? </img>
<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}> : index === 1 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img> </img>
: index === 1 ? : index === 2 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img> </img>
: index === 2 ? : index === 3 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <div>
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img> </img>
: index === 3 ?
<div> <img className="regitemimgs222"
src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
</img>
</div>
: ""
)
})
}
</div>
:
<div className=" " style={{
marginLeft: "37px",
display: "flex",
flexDirection: "initial",
width: "487px"
}}>
{
item && item.team_members.map((item, index) => {
return (
index === 0 ?
<img className="regitemimgs" src={getImageUrl("images/" + item.image_url)}>
</img>
: index === 1 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img>
: index === 2 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}> <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img> </img>
: index === 3 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
<img className="regitemimgs222" </img>
src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}> : index === 4 ?
<img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
</img> </img>
</div> : index === 5 ?
: "" <div>
) <img className="regitemimgs2" src={getImageUrl("images/" + item.image_url)}>
})
} </img>
<img className="regitemimgs222"
src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
</div> : </img>
</div>
: ""
)
})
}
</div>
)
:
<div className=" " style={{ <div className=" " style={{
marginLeft: "37px", marginLeft: "37px",
display: "flex", display: "flex",
@ -170,7 +226,7 @@ class PersonalCompetititem extends React.Component {
</img> </img>
<img className="regitemimgs22" <img className="regitemimgs222"
src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}> src={getImageUrl(`images/educoder/competitions/pexjiazai.png`)}>
</img> </img>
@ -182,10 +238,19 @@ class PersonalCompetititem extends React.Component {
</div> </div>
} }
<div className=" " style={this.props.type === 5 || this.props.type === 2 ? { <div style={this.props.type === 5 || this.props.type === 2 ?
marginLeft: "20px", (this.props.mode === 3 ?
} : {
marginLeft: "37px", {
marginLeft: "37px",
}
:
{
marginLeft: "18px",
}
)
: {
marginLeft: "16px",
}}> }}>
<div style={{marginTop: "23px", width: '140px'}}> <div style={{marginTop: "23px", width: '140px'}}>
<span style={{ <span style={{
@ -204,7 +269,7 @@ class PersonalCompetititem extends React.Component {
height: "1px", height: "1px",
width: "1px" width: "1px"
}}> }}>
<input id="copy_invite_code" <input id={"copy_invite_code" + this.props.index}
value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}/> value={item.invite_code === null || item.invite_code === undefined ? "" : item.invite_code}/>
</div> </div>
</div> </div>
@ -222,7 +287,7 @@ class PersonalCompetititem extends React.Component {
marginLeft: "18px", marginLeft: "18px",
}} }}
onClick={() => { onClick={() => {
jsCopy() jsCopy("copy_invite_code" + this.props.index)
}} }}
> >
</i> </i>
@ -231,49 +296,81 @@ class PersonalCompetititem extends React.Component {
{ {
this.props.type === 5 ? this.props.type === 5 ?
<div className="regitemimgs444" (this.props.mode === 3 ?
style={{ <div className="regitemimgs444"
marginLeft: "32px", style={{
}} marginLeft: "32px",
> }}
<div className="regitemimgs555"> >
<a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{ <div className="regitemimgs555">
color: "#459be5", <a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{
width: "100%", color: "#459be5",
height: "100%", width: "100%",
lineHeight: "39px", height: "100%",
}}>战队详情</a> lineHeight: "39px",
</div> }}>战队详情</a>
<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}> </div>
<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p> <div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
</div> <p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}> </div>
<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p> <div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
</div> <p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div>
</div> </div>
: this.props.type === 2 ? :
<div className="regitemimgs444 " <div className="regitemimgs444"
style={{ style={{
marginLeft: "32px", marginLeft: "32px",
}} }}
> >
<div className="regitemimgs5" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
</div>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div>
<div className="regitemimgs555"> </div>
<a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{
color: "#459be5", )
width: "100%", : this.props.type === 2 ?
height: "100%", (this.props.mode === 3 ?
lineHeight: "39px", <div className="regitemimgs444 "
}}>战队详情</a> style={{
</div> marginLeft: "32px",
<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}> }}
<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p> >
</div> <div className="regitemimgs555">
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}> <a href={`/newcompetitions/${"gcc-course-2019"}/competition_teams/${item.id}`} style={{
<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p> color: "#459be5",
</div> width: "100%",
</div> height: "100%",
lineHeight: "39px",
}}>战队详情</a>
</div>
<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
</div>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div>
</div>
:
<div className="regitemimgs444 "
style={{
marginLeft: "32px",
}}
>
<div className="regitemimgs5" onClick={() => this.props.Exittheteamshow(item.id, false)}>
<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
</div>
<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
</div>
</div>
)
: :
this.props.type === 3 ? this.props.type === 3 ?
<div className="regitemimgs4" <div className="regitemimgs4"

Write Preview
Loading…
Cancel
Save