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

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js

@@ -17,7 +17,14 @@ class CompetitionContentspdf extends Component{
 
 	componentDidMount(){
 		window.document.title = '竞赛';
-
+		let query=this.props.location&&this.props.location.search;
+		const types = query.split('user_id=')
+		if(types[1]===undefined){
+		}else{
+			this.setState({
+				Tabskey:"2"
+			})
+		}
 	}
 
 	Competitioncallback=(key)=>{
@@ -54,4 +61,4 @@ class CompetitionContentspdf extends Component{
 		)
 	}
 }
-export default CompetitionContentspdf;
+export default CompetitionContentspdf;

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js

@@ -340,7 +340,11 @@ class CompetitionContentspdfpeopledata extends Component {
 
 
 	render() {
-		const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state
+		const admins=this.props.user.admin;
+		if(admins===undefined||admins===null) {
+			admins === false;
+		}
+			const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state
 		return (
 			<div className="flexdidirectionss mt17">
 				{this.state.certification === 1 ?
@@ -528,7 +532,19 @@ class CompetitionContentspdfpeopledata extends Component {
 							}
 
 						</div>
-						: ""
+						:
+						<div>
+							{
+								admins===true?
+									<Bankcardnumberverifications {...this.props} {...this.state} basicInfo={this.state.basicInfo}
+																							 hideUpdating={(i) => this.hideUpdating(i)}
+																							 getdata={() => this.getdata()}
+																							 GetawardinformationAPI={() => this.GetawardinformationAPI()}
+																							 bank_account={this.state.bank_account}
+									></Bankcardnumberverifications>
+									:""
+							}
+						</div>
 				}