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

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

@@ -117,8 +117,8 @@ class Registration extends React.Component {
 						personal: result.data.personal,
 						enroll_ended: result.data.enroll_ended,
 						enrolled: result.data.enrolled,
-						teacher_staff: result.data.teacher_staff === undefined || result.data.teacher_staff === null ? undefined : result.data.teacher_staff,
-						member_staff: result.data.member_staff === undefined || result.data.member_staff === null ? undefined : result.data.member_staff,
+						teacher_staff: result.data.teacher_staff === undefined || result.data.teacher_staff === null ? null : result.data.teacher_staff,
+						member_staff: result.data.member_staff === undefined || result.data.member_staff === null ? null : result.data.member_staff,
 
 					})
 
@@ -442,14 +442,40 @@ class Registration extends React.Component {
 	 * 加入战队
 	 * */
 	Jointheteam = () => {
-		if (this.state.enrolled === true) {
-			//已经报名
-			this.setState({
-				messagePerbool: true,
-				intpermessages: "你已经报名,不能重复报名"
-			})
-			return;
+		if (this.props.user.is_teacher === true) {
+			try {
+				if (this.props.teamutiple_limited === true) {
+					if (this.state.enrolled === true) {
+						//已经报名
+						this.setState({
+							messagePerbool: true,
+							intpermessages: "你已经报名,不能重复报名"
+						})
+						return;
+					}
+				}
+			} catch (e) {
+
+			}
+
+		} else {
+			try {
+				if (this.props.mutiple_limited === true) {
+					if (this.state.enrolled === true) {
+						//已经报名
+						this.setState({
+							messagePerbool: true,
+							intpermessages: "你已经报名,不能重复报名"
+						})
+						return;
+					}
+				}
+			} catch (e) {
+
+			}
 		}
+
+
 		if (this.state.enroll_ended === true) {
 			//报名截止
 			this.setState({
@@ -458,6 +484,8 @@ class Registration extends React.Component {
 			})
 			return
 		}
+
+
 		if (this.props.user.is_teacher === true) {
 			//老师
 			if (this.state.teacher_staff === null) {
@@ -496,13 +524,37 @@ class Registration extends React.Component {
 	 **/
 	Createateam = () => {
 		//
-		if (this.state.enrolled === true) {
-			//已经报名
-			this.setState({
-				messagePerbool: true,
-				intpermessages: "您已报名，无需重复报"
-			})
-			return;
+		if (this.props.user.is_teacher === true) {
+			try {
+				if (this.props.teamutiple_limited === true) {
+					if (this.state.enrolled === true) {
+						//已经报名
+						this.setState({
+							messagePerbool: true,
+							intpermessages: "你已经报名,不能重复报名"
+						})
+						return;
+					}
+				}
+			} catch (e) {
+
+			}
+
+		} else {
+			try {
+				if (this.props.mutiple_limited === true) {
+					if (this.state.enrolled === true) {
+						//已经报名
+						this.setState({
+							messagePerbool: true,
+							intpermessages: "你已经报名,不能重复报名"
+						})
+						return;
+					}
+				}
+			} catch (e) {
+
+			}
 		}
 		if (this.state.enroll_ended === true) {
 			//报名截止
@@ -512,6 +564,7 @@ class Registration extends React.Component {
 			})
 			return
 		}
+
 		if (this.props.user.is_teacher === true) {
 			//老师
 			if (this.state.teacher_staff === null) {
@@ -796,7 +849,7 @@ class Registration extends React.Component {
 							(
 								data && data.map((item, index) => {
 									return (
-										<PersonalCompetititem key={index} type={type} item={item}
+										<PersonalCompetititem key={index} type={type} item={item} index={index}
 																					Exittheteamshow={(itemid) => this.Exittheteamshow(itemid)}
 																					Createateamedit={(itemid) => this.Createateamedit(itemid)}></PersonalCompetititem>
 									)

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

@@ -66,7 +66,7 @@ class PersonalCompetititem extends React.Component {
 				{
 					item !== undefined || item !== null ? <div className={"yslborderbottom"}>
 							<div
-								className={this.props.key === undefined || this.props.key === null ? "myregitem11" : this.props.key === 0 ? "regitem" : "myregitem11"}
+								className={this.props.index === undefined || this.props.index === null ? "myregitem11" : this.props.index === 0 ? "regitem" : "myregitem11"}
 								style={{
 								marginBottom: "19px",
 							}}>