竞赛调整

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

@@ -11,7 +11,7 @@
     color:rgba(0,0,0,1);
 }
 .pdfdownloadfont4CACFF{
-    color: #4CACFF;
+    color: #4CACFF !important;
 }
 
 .pdfdownloadfont00CC5F{

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

@@ -10,7 +10,8 @@ class CompetitionContentspdfdownload extends Component{
 	constructor(props) {
 		super(props)
 		this.state={
-			data:undefined
+			data:undefined,
+			teams:undefined
 		}
 	}
 
@@ -19,8 +20,23 @@ class CompetitionContentspdfdownload extends Component{
 		let url=`/competitions/${this.props.match.params.identifier}/prize.json`;
 		axios.get(url).then((response) => {
 			if(response.status===200){
+
+				let datas=response.data.teams;
+				if(datas.length>0){
+					datas.map((item,key)=>{
+						let lista=item.team_members;
+						if(lista.length>0){
+							console.log(lista)
+							lista.map((i,k)=>{
+							 i["bank_account"]=item.bank_account;
+							})
+						}
+					})
+				}
+
 				this.setState({
 					data:response.data,
+					teams:datas,
 				})
 			}
 		}).catch((error) => {
@@ -30,19 +46,10 @@ class CompetitionContentspdfdownload extends Component{
 
 	render() {
 
-		// email_binded: true
-		// name: "伍逸凡"
-		// phone_binded: true
-		// professional_auth: "authed"
-		// real_name_auth: "authed"
-		// role: "队长"
-
-    let {data}=this.state;
-    let bank_account=[];
-		{data&&data.teams.map((item,key)=>{
-			bank_account.push(item.bank_account)
-		})
-		}
+
+
+    let {data,teams}=this.state;
+
 		const columns = [
 		{
 			title: '角色',
@@ -108,21 +115,20 @@ class CompetitionContentspdfdownload extends Component{
 				title: '开户行及银行卡号信息（队长填写）',
 				key: 'idcard',
 				dataIndex: 'idcard',
-				render: (value, row, index,record) => {
-					console.log(row)
-					console.log(record)
-					console.log(value)
-					const obj = {
-						children: bank_account[index],
-						props: {},
-					};
-
-					obj.props.rowSpan = 0;
-					return obj
+				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>,
+						};
+					}
+
 				},
 			},
 	];
 
+
+   let people=[  { url: '/api/competitions/xxxxx/certificates/1/personal' },
+		 { url: '/api/competitions/xxxxx/certificates/2/personal' },]
 		return (
 			<React.Fragment>
 				<Row>
@@ -134,13 +140,30 @@ class CompetitionContentspdfdownload extends Component{
 				</Row>
 
 				<Row className={"mt30"}>
-					{data&&data.personal_certifications.length===0?<Col>个人证书：<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></Col>:""}
+				   <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}>
+									<img src={ getImageUrl(`images/educoder/pdfs.png`)} />
+									<a className={"pdfdownloadfont4CACFF ml10"}    href={item.url} download=""
+										 title="下载"  mce_href="#">立即下载</a>
+								</span>
+							)
+						})}</Col>
 				</Row>
 
 				<Row className={"mt30"}>
 					<Col>团队证书：
 						{data&&data.team_certifications.length===0?<span className={"pdfpicture font-14"}>暂未生成</span>
-						:<span className={"ml20"}><i className="iconfont icon-pdf"></i><a>立即下载</a></span>}
+						:data&&data.team_certifications.map((item,key)=>{
+							return(
+								<span className={"mr10"} key={key}>
+									<img src={ getImageUrl(`images/educoder/pdfs.png`)} />
+									<a className={"pdfdownloadfont4CACFF ml10"}    href={item.url} download=""
+										 title="下载"  mce_href="#">立即下载</a>
+								</span>
+							)
+						})}
 					</Col>
 				</Row>
 				<Divider />
@@ -152,12 +175,15 @@ class CompetitionContentspdfdownload extends Component{
 						}
 						.pdfdownloadTable .ant-table-tbody > tr > td{
 							color:#666666;
-							// border-bottom: 1px solid transparent;
+				      border-bottom: 1px solid transparent;
 						}
+						.pdfdownloadTable .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
+  					  text-align: center;
+			      }
 						`
 					}
 				</style>
-				{data&&data.teams.map((item,key)=>{
+				{teams&&teams.map((item,key)=>{
 					return(
 						<Row className={"mt30"} key={key}>
 							<Col className={"pdfpicture mb20"}>{item.name}战队信息填报概况</Col>

public/react/src/modules/courses/statistics/Statistics.js

@@ -438,7 +438,7 @@ class Statistics extends Component{
 										return(
 											<Col  span={5} className={"relatives"}>
 												<li className="pr rankingss">
-													<img src="https://test-newweb.educoder.net/images/educoder/imperialcrown.png" className="huangguans mb5" />
+													<img src={getImageUrl(`images/educoder/imperialcrown.png`)} className="huangguans mb5" />
 													<a href={`/users/${item.user_login}`} className="color-dark">
 														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
 													</a>