jingsai.7

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

@@ -44,7 +44,11 @@ class RegisListviewdata extends React.Component {
 									<img className="regitemimg2" src={getImageUrl("images/" + item.creator.image_url)}>
 
 									</img>
-									<p>{item.creator.name}</p>
+									<p style={{
+										color: "#999999", fontSize: "14px",
+										width: "78px",
+										textAlign: "center"
+									}}>{item.creator.name}</p>
 								</div>
 								<div style={{
 									marginTop: "29px",

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

@@ -60,7 +60,7 @@ class Registration extends React.Component {
 			intpermessages: "确认",
 			messageexit: "提示",
 			messageexitol: false,
-			exitintpermessages: "是否退出战队",
+			exitintpermessages: "是否确认退出战队?",
 			itemid: undefined,
 			itemiddata: [],
 			pint: 0,
@@ -324,7 +324,7 @@ class Registration extends React.Component {
 					}
 					} else {
 						//团队赛
-						////console.log("d");
+						//////console.log("d");
 
 						this.setState({
 							type: 6,
@@ -532,13 +532,13 @@ class Registration extends React.Component {
 			this.setState({
 				messageexitol: true,
 				itemid: itemid,
-				exitintpermessages: "是否删除战队",
+				exitintpermessages: "是否确认删除战队",
 			})
 		} else {
 			this.setState({
 				messageexitol: true,
 				itemid: itemid,
-				exitintpermessages: "是否退出战队",
+				exitintpermessages: "是否确认退出战队",
 			})
 		}
 
@@ -678,7 +678,7 @@ class Registration extends React.Component {
 																	GetenrollmentAPI={GetenrollmentAPI}></MessagePersonModal>
 							: ""
 					}
-
+					{/*编辑创建战队*/}
 					{
 						tmodalsType === true ?
 							<PersonModal modalsType={tmodalsType} {...this.props} {...this.state} Newtit={Newtit}

public/react/src/modules/competition/competmodal/PersonModal.js

@@ -57,6 +57,7 @@ class PersonModal extends Component {
 	}
 	componentDidMount() {
 		var data = [];
+		var polls_nametests = "";
 		var datas = {
 			enrollable: false,
 			id: this.props.user.user_id,
@@ -67,13 +68,45 @@ class PersonModal extends Component {
 			type: "创建者",
 		};
 		data.push(datas);
+
+		console.log("itemiddata");
+		console.log("编辑战队")
+		console.log(this.props.itemiddata);
+		try {
+			if (this.props.Newtit === false) {
+				for (var i = 0; i < this.props.itemiddata.team_members.length; i++) {
+					if (i === 0) {
+						///因为第一个位置是创建者 所以要过滤掉
+					} else {
+						var datasy = {
+							enrollable: false,
+							id: this.props.itemiddata.team_members[i].user_id,
+							name: this.props.itemiddata.team_members[i].name,
+							school_name: this.props.itemiddata.team_members[i].school_name,
+							student_id: null,
+							identity: this.props.itemiddata.team_members[i].identity,
+							type: this.props.itemiddata.team_members[i].role === "teacher" ? "导师" : "队员",
+						};
+						data.push(datasy);
+					}
+				}
+				if (this.props.itemiddata) {
+					polls_nametests = this.props.itemiddata.name;
+				}
+			}
+		} catch (e) {
+
+		}
+
 		this.setState({
 			myuser: this.props.user,
 			mydatas: data,
+			polls_nametest: polls_nametests
 		})
 		this.setState({
 			GetenrollmentAPI: this.props.GetenrollmentAPI,
 		})
+
 	}
 
 	componentDidUpdate = (prevProps) => {
@@ -140,11 +173,12 @@ class PersonModal extends Component {
 				myshtudentdata.push(mydatas[a].id);
 			}
 		}
-		if (GetenrollmentAPI) {
-			if (GetenrollmentAPI !== undefined || GetenrollmentAPI !== null) {
-				if (GetenrollmentAPI.teacher_staff !== undefined || GetenrollmentAPI.teacher_staff !== null) {
-					if (GetenrollmentAPI.teacher_staff.minimum > i) {
 
+
+		try {
+			if (GetenrollmentAPI) {
+				if (GetenrollmentAPI.teacher_staff) {
+					if (GetenrollmentAPI.teacher_staff.minimum > i) {
 						this.setState({
 							Thecurrentnumberbool: true,
 							Thecurrentnumber: i,
@@ -164,7 +198,10 @@ class PersonModal extends Component {
 
 				}
 			}
+		} catch (e) {
+
 		}
+
 		// Thecurrentnumber
 		if (this.props.Newtit === true) {
 			//创建新的战队
@@ -186,8 +223,8 @@ class PersonModal extends Component {
 			});
 		} else {
 			//编辑战队
-			let url = `/competitions/${"gcc-course-2019"}/competition_teams/${"gcc-course-2019"}.json`;
+			let url = `/competitions/${this.props.match.params.identifier}/competition_teams/${this.props.itemiddata.id}.json`;
-			axios.post(url, {
+			axios.put(url, {
 				name: polls_nametest,
 				teacher_ids: myteaherdata,
 				member_ids: myshtudentdata,
@@ -866,6 +903,7 @@ class PersonModal extends Component {
 						</p>
 
 						<Input className="yslzxueshiskmc" onInput={this.changeTopicName} onFocus={this.inputOnFocus3}
+									 value={this.state.polls_nametest}
 									 placeholder="请输入您的战队名称，最多不超过60个字符"
 									 addonAfter={String(addonAfter) + "/60"} maxLength={60}/>
 

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

@@ -57,6 +57,8 @@ class PersonalCompetititem extends React.Component {
 		// const listItems = mydatas.map((item, index) =>
 		//
 		// );
+		console.log("PersonalCompetititem");
+		console.log(data);
 		return (
 			<div>
 				{
@@ -86,7 +88,7 @@ class PersonalCompetititem extends React.Component {
 									fontSize: "16px",
 									width: "160px",
 									textAlign: "center"
-								}}>{data[0].school_name}</p>
+								}}>{data[0].name}</p>
 							</div>
 							<div className=" " style={{
 								marginLeft: "37px",