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

public/react/src/modules/competition/Registration.js

@@ -67,6 +67,7 @@ class Registration extends React.Component {
 			mutiple_limited: false,
 			teamutiple_limited: false,
 			members_count: 0,
+			mode: 0
 
 		}
 	}
@@ -87,6 +88,7 @@ class Registration extends React.Component {
 			// 	this.Getdata(keyword, page, per_page, this.props.isAdmin());
 			// 	this.GetenrollmentAPI();
 		}
+		this.Getdataheader();
 	}
 
 	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
 	GetenrollmentAPI = () => {
 		// console.log("调用了GetenrollmentAPI");
@@ -524,6 +545,7 @@ class Registration extends React.Component {
 	 **/
 	Createateam = () => {
 		//
+
 		if (this.props.user.is_teacher === true) {
 			try {
 				if (this.props.teamutiple_limited === true) {
@@ -736,7 +758,7 @@ class Registration extends React.Component {
 
 
 	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 (
 			<div className="newMain clearfix  newMainybot">
@@ -849,7 +871,7 @@ class Registration extends React.Component {
 							(
 								data && data.map((item, index) => {
 									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)}
 																					Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem>
 									)

public/react/src/modules/competition/personal/PersonalCompetititem.js

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