From ab502dbaf330efd5c6e781ab0415498521ea9304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 1 Nov 2019 22:58:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CompetitionContentspdfdownload.css | 2 +-
.../CompetitionContentspdfdownload.js | 84 ++++++++++++-------
.../modules/courses/statistics/Statistics.js | 2 +-
3 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css
index b8d6812f1..27ce04e99 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.css
+++ b/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{
diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
index c83cefe7f..55d7fd239 100644
--- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
+++ b/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: {record.bank_account.bank + record.bank_account.second_bank + record.bank_account.card_no},
+ };
+ }
+
},
},
];
+
+ let people=[ { url: '/api/competitions/xxxxx/certificates/1/personal' },
+ { url: '/api/competitions/xxxxx/certificates/2/personal' },]
return (
@@ -134,13 +140,30 @@ class CompetitionContentspdfdownload extends Component{
- {data&&data.personal_certifications.length===0?个人证书：暂未生成 原因：还未认证个人信息，this.props.Competitioncallback("2")}>立即查看:""}
+ 个人证书： {data&&data.personal_certifications.length===0?暂未生成 原因：还未认证个人信息，this.props.Competitioncallback("2")}>立即查看:
+ data&&data.personal_certifications.map((item,key)=>{
+ return(
+
+ 
+ 立即下载
+
+ )
+ })}
团队证书：
{data&&data.team_certifications.length===0?暂未生成
- :立即下载}
+ :data&&data.team_certifications.map((item,key)=>{
+ return(
+
+
+ 立即下载
+
+ )
+ })}
@@ -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;
+ }
`
}
- {data&&data.teams.map((item,key)=>{
+ {teams&&teams.map((item,key)=>{
return(
{item.name}战队信息填报概况
diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js
index 3ba159dbf..d11df0b6a 100644
--- a/public/react/src/modules/courses/statistics/Statistics.js
+++ b/public/react/src/modules/courses/statistics/Statistics.js
@@ -438,7 +438,7 @@ class Statistics extends Component{
return(
- 
+ })
})