Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -295,6 +295,13 @@ class PersonModal extends Component {
 				// ////console.log(result);
 				if (result) {
 					if (result.data) {
+						try {
+							if (result.data.status === 0) {
+								this.props.showNotification(`报名成功，预祝您夺得桂冠`);
+							}
+						} catch (e) {
+
+						}
 						this.props.Tmoconfirm1(true);
 					}
 				}
@@ -1304,7 +1311,7 @@ class PersonModal extends Component {
 					{/*导师*/}
 					{
 						teacher_staff === undefined || teacher_staff === null ?
-							"" :
+							<div style={{marginLeft: "53px", minHeight: "14px", height: "14px"}}></div> :
 
 							<div>
 								<div style={{
@@ -1368,7 +1375,7 @@ class PersonModal extends Component {
 					{/*队员*/}
 					{
 						member_staff === undefined || member_staff === null ?
-							"" :
+							<div style={{marginLeft: "53px", minHeight: "18px", height: "18px"}}></div> :
 							<div>
 								<div style={{
 									display: "flex",