Merge branch 'yslcompetition' of https://bdgit.educoder.net/Hjqreturn/educoder into ysm1

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

@@ -394,7 +394,7 @@ class Registration extends React.Component {
 			//已经报名
 			this.setState({
 				messagePerbool: true,
-				intpermessages: "您已报名，无需重复报"
+				intpermessages: "你已经报名,不能重复报名"
 			})
 			return;
 		}

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

@@ -198,7 +198,12 @@ class PersonModal extends Component {
 						})
 						return
 					}
-
+					this.setState({
+						Thecurrentnumberbool: false,
+						Thecurrentnumber: i,
+						booltech: false,
+						boolstud: false
+					})
 				}
 			}
 		} catch (e) {
@@ -226,7 +231,12 @@ class PersonModal extends Component {
 						})
 						return
 					}
-
+					this.setState({
+						Thecurrentnumberboolstu: false,
+						Thecurrentnumberstu: s,
+						booltech: false,
+						boolstud: false
+					})
 				}
 			}
 		} catch (e) {
@@ -582,13 +592,15 @@ class PersonModal extends Component {
 		// ////console.log("inputOnBlur");
 		// ////console.log(e);
 		this.setState({
-			person1: false
+			person1: false,
+			person2: false
 		})
 	}
 	inputOnBlur2 = (e) => {
 		// ////console.log("inputOnBlur");
 		// ////console.log(e);
 		this.setState({
+			person1: false,
 			person2: false
 		})
 	}
@@ -1141,6 +1153,7 @@ class PersonModal extends Component {
 								placeholder="请输入老师姓名的任意关键字进行搜索，可以后续在添加"
 								onPressEnter={this.startSearch}
 								onFocus={this.inputOnFocus}
+								onBlur={this.inputOnBlur}
 								onChange={(e) => this.teacheronChange(e)}
 								value={this.state.keywordteachers}
 								suffix={
@@ -1199,6 +1212,7 @@ class PersonModal extends Component {
 								placeholder="请输入想要队员姓名的任意关键字进行搜索"
 								onPressEnter={this.startSearch2}
 								onFocus={this.inputOnFocus2}
+								onBlur={this.inputOnBlur2}
 								onChange={(e) => this.studentsonChange(e)}
 								value={this.state.keywordstudents}
 								suffix={

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

@@ -9,7 +9,7 @@ import moment from 'moment';
 import {SnackbarHOC, WordsBtn, getImageUrl} from 'educoder';
 import {TPMIndexHOC} from '../../tpm/TPMIndexHOC';
 import competition from '../comcss/competition.css';
-import {Button, message} from 'antd';
+import {Button, message, Tooltip} from 'antd';
 // 点击按钮复制功能
 function jsCopy() {
 	var e = document.getElementById("copy_invite_code");
@@ -175,16 +175,17 @@ class PersonalCompetititem extends React.Component {
 									>
 									</i>
 									:
-									<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
+									<Tooltip placement="bottom" title={"复制邀请码"}>
-										 style={{
+										<i className="regitemimgs3 iconfont icon-fuzhi1 font-14 font-n"
-											 marginLeft: "18px",
+											 style={{
-										 }}
+												 marginLeft: "18px",
-										 onClick={() => {
+											 }}
-											 jsCopy()
+											 onClick={() => {
-										 }}
+												 jsCopy()
-									>
+											 }}
-									</i>
+										>
-
+										</i>
+									</Tooltip>
 								}
 
 							{