Merge branch 'dev_ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_auth

# Conflicts:
#	public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js
#	public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js

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

@@ -7,7 +7,6 @@ import CompetitionContentspdfpeopledata from './CompetitionContentspdfChild/Comp
 // import NoneData from "../../../courses/shixunHomework/shixunHomework";
 
 const { TabPane } = Tabs;
-
 class CompetitionContentspdf extends Component{
 	constructor(props) {
 		super(props)
@@ -36,17 +35,17 @@ class CompetitionContentspdf extends Component {
 				<div className={"mb100 "}>
 					<Tabs defaultActiveKey="1" onChange={(e) => this.Competitioncallback(e)} activeKey={this.state.Tabskey}>
 						<TabPane tab="获奖证书下载" key="1" >
-							<CompetitionContentspdfdownload
+							{this.state.Tabskey==="1"?<CompetitionContentspdfdownload
 								{...this.props}
 								{...this.state}
 								Competitioncallback={(e)=>this.Competitioncallback(e)}
-							/>
+							/>:""}
 						</TabPane>
 						<TabPane tab="完善个人信息" key="2">
-							<CompetitionContentspdfpeopledata
+							{this.state.Tabskey==="2"?<CompetitionContentspdfpeopledata
 								{...this.props}
 								{...this.state}
-							/>
+							/>:""}
 						</TabPane>
 					</Tabs>
 				</div>
@@ -55,5 +54,4 @@ class CompetitionContentspdf extends Component {
 		)
 	}
 }
-
 export default CompetitionContentspdf;

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

@@ -3,7 +3,6 @@ import {Button, Layout, Row, Col, Divider, Table} from 'antd';
 import axios from 'axios';
 import {getImageUrl} from 'educoder';
 import './CompetitionContentspdfdownload.css';
-
 // import NoneData from "../../../courses/shixunHomework/shixunHomework";
 
 
@@ -48,6 +47,7 @@ class CompetitionContentspdfdownload extends Component {
 	render() {
 
 
+
     let {data,teams}=this.state;
 
 		const columns = [
@@ -77,10 +77,7 @@ class CompetitionContentspdfdownload extends Component {
 			key: 'namecertify',
 			render: (text, record) => (
 				<span>
-				{record.real_name_auth === "authed" ?
-					<span className={"pdfdownloadfont00CC5F"}>已认证</span> : record.real_name_auth === "authing" ?
-						<span className={"pdfdownloadfontFF6602"}>待审核</span> : record.real_name_auth === "not_authed" ?
-							<span className={"color-red"}>未认证</span> : ""}
+				{record.real_name_auth==="authed"?<span className={"pdfdownloadfont00CC5F"}>已认证</span>:record.real_name_auth==="authing"?<span className={"pdfdownloadfontFF6602"}>待审核</span>:record.real_name_auth==="not_authed"?<span className={"color-red"}>未认证</span>:""}
       </span>
 			),
 		},
@@ -90,10 +87,7 @@ class CompetitionContentspdfdownload extends Component {
 			dataIndex: 'certify',
 			render: (text, record) => (
 				<span>
-				{record.professional_auth === "authed" ?
-					<span className={"pdfdownloadfont00CC5F"}>已认证</span> : record.real_name_auth === "authing" ?
-						<span className={"pdfdownloadfontFF6602"}>待审核</span> : record.real_name_auth === "not_authed" ?
-							<span className={"color-red"}>未认证</span> : ""}
+				{record.professional_auth==="authed"?<span className={"pdfdownloadfont00CC5F"}>已认证</span>:record.real_name_auth==="authing"?<span className={"pdfdownloadfontFF6602"}>待审核</span>:record.real_name_auth==="not_authed"?<span className={"color-red"}>未认证</span>:""}
       </span>
 			),
 		},
@@ -103,8 +97,7 @@ class CompetitionContentspdfdownload extends Component {
 			dataIndex: 'mobile',
 			render: (text, record) => (
 				<span>
-				{record.phone_binded === true ? <span className={"pdfdownloadfont00CC5F"}>已绑定</span> :
-					<span className={"color-red"}>未绑定</span>}
+				{record.phone_binded===true?<span className={"pdfdownloadfont00CC5F"}>已绑定</span>:<span className={"color-red"}>未绑定</span>}
       </span>
 		),
 		},
@@ -114,8 +107,7 @@ class CompetitionContentspdfdownload extends Component {
 			dataIndex: 'mail',
 			render: (text, record) => (
 				<span>
-					{record.email_binded === true ? <span className={"pdfdownloadfont00CC5F"}>已绑定</span> :
-						<span className={"color-red"}>未绑定</span>}
+					{record.email_binded===true?<span className={"pdfdownloadfont00CC5F"}>已绑定</span>:<span className={"color-red"}>未绑定</span>}
       </span>
 			),
 		},
@@ -126,8 +118,7 @@ class CompetitionContentspdfdownload extends Component {
 				render: (value, record, index) => {
 					if (index === 0&&record.bank_account!=null) {
 						return {
-							children:
-								<span>{record.bank_account.bank + record.bank_account.second_bank + record.bank_account.card_no}</span>,
+							children: <span>{record.bank_account.bank + record.bank_account.second_bank + record.bank_account.card_no}</span>,
 						};
 					}
 
@@ -149,10 +140,7 @@ class CompetitionContentspdfdownload extends Component {
 				</Row>
 
 				<Row className={"mt30"}>
-					<Col>个人证书： {data && data.personal_certifications.length === 0 ?
-						<span><span className={"pdfpicture font-14"}>暂未生成</span>  <span className={"ml20"}>原因：<span
-							className={"pdfpicture font-14"}>还未认证个人信息，</span><a className={"pdfdownloadfont4CACFF"}
-																																	onClick={() => this.props.Competitioncallback("2")}>立即查看</a></span></span> :
+				   <Col>个人证书：{data&&data.personal_certifications.length===0?<span><span className={"pdfpicture font-14"}>暂未生成</span>  <span className={"ml20"}>原因：<span className={"pdfpicture font-14"}>还未认证个人信息，</span><a className={"pdfdownloadfont4CACFF"} onClick={()=>this.props.Competitioncallback("2")}>立即查看</a></span></span>:
 						 data&&data.personal_certifications.map((item,key)=>{
 							return(
 								<span className={"mr10"} key={key}>
@@ -200,8 +188,7 @@ class CompetitionContentspdfdownload extends Component {
 						<Row className={"mt30"} key={key}>
 							<Col className={"pdfpicture mb20"}>{item.name}战队信息填报概况</Col>
 
-							<Table columns={columns} dataSource={item.team_members} className={"pdfdownloadTable"}
-										 pagination={false}/>
+							<Table columns={columns} dataSource={item.team_members} className={"pdfdownloadTable"} pagination={false}/>
 						</Row>
 					)
 				})
@@ -212,5 +199,4 @@ class CompetitionContentspdfdownload extends Component {
 		)
 	}
 }
-
 export default CompetitionContentspdfdownload;