m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js
#	public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
dev_auth
杨树明 5 years ago
parent bcfe2df1dd 936922ba6b
commit dd74208183
2 changed files with 110 additions and 126 deletions
Show Stats Download Patch File Download Diff File

34
public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js
Unescape View File

@ -1,29 +1,28 @@
import React, {Component} from 'react';
import React, { Component } from 'react';
import {Tabs} from 'antd';
import axios from 'axios';
import {markdownToHTML, getImageUrl, AttachmentList} from 'educoder';
import {markdownToHTML,getImageUrl,AttachmentList} from 'educoder';
import CompetitionContentspdfdownload from './CompetitionContentspdfChild/CompetitionContentspdfdownload';
import CompetitionContentspdfpeopledata from './CompetitionContentspdfChild/CompetitionContentspdfpeopledata';
// import NoneData from "../../../courses/shixunHomework/shixunHomework";
const {TabPane} = Tabs;
class CompetitionContentspdf extends Component {
const { TabPane } = Tabs;
class CompetitionContentspdf extends Component{
constructor(props) {
super(props)
this.state = {
Tabskey: "1"
this.state={
Tabskey:"1"
}
}
componentDidMount() {
componentDidMount(){
window.document.title = '竞赛';
}
Competitioncallback = (key) => {
Competitioncallback=(key)=>{
this.setState({
Tabskey: key
Tabskey:key
})
}
@ -35,18 +34,18 @@ class CompetitionContentspdf extends Component {
<div className={"fr"}>
<div className={"mb100 "}>
<Tabs defaultActiveKey="1" onChange={(e) => this.Competitioncallback(e)} activeKey={this.state.Tabskey}>
<TabPane tab="获奖证书下载" key="1">
<CompetitionContentspdfdownload
<TabPane tab="获奖证书下载" key="1" >
{this.state.Tabskey==="1"?<CompetitionContentspdfdownload
{...this.props}
{...this.state}
Competitioncallback={(e) => this.Competitioncallback(e)}
/>
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;
export default CompetitionContentspdf;

202
public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js
Unescape View File

@ -1,43 +1,42 @@
import React, {Component} from 'react';
import {Button, Layout, Row, Col, Divider, Table} from 'antd';
import React, { Component } from 'react';
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";
class CompetitionContentspdfdownload extends Component {
class CompetitionContentspdfdownload extends Component{
constructor(props) {
super(props)
this.state = {
data: undefined,
teams: undefined
this.state={
data:undefined,
teams:undefined
}
}
componentDidMount() {
componentDidMount(){
window.document.title = '竞赛';
let url = `/competitions/${this.props.match.params.identifier}/prize.json`;
let url=`/competitions/${this.props.match.params.identifier}/prize.json`;
axios.get(url).then((response) => {
if (response.status === 200) {
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) {
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;
lista.map((i,k)=>{
i["bank_account"]=item.bank_account;
})
}
})
}
this.setState({
data: response.data,
teams: datas,
data:response.data,
teams:datas,
})
}
}).catch((error) => {
@ -48,96 +47,88 @@ class CompetitionContentspdfdownload extends Component {
render() {
let {data, teams} = this.state;
let {data,teams}=this.state;
const columns = [
{
title: '角色',
dataIndex: 'type',
key: 'type',
render: (text, record) => (
<span>
{
title: '角色',
dataIndex: 'type',
key: 'type',
render: (text, record) => (
<span>
{record.role}
</span>
),
},
{
title: '姓名',
dataIndex: 'name',
key: 'name',
render: (text, record) => (
<span>
),
},
{
title: '姓名',
dataIndex: 'name',
key: 'name',
render: (text, record) => (
<span>
{record.name}
</span>
),
},
{
title: '实名认证',
dataIndex: 'namecertify',
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> : ""}
),
},
{
title: '实名认证',
dataIndex: 'namecertify',
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>:""}
</span>
),
},
{
title: '职业认证',
key: 'certify',
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> : ""}
),
},
{
title: '职业认证',
key: 'certify',
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>:""}
</span>
),
},
{
title: '手机绑定',
key: 'mobile',
dataIndex: 'mobile',
render: (text, record) => (
<span>
{record.phone_binded === true ? <span className={"pdfdownloadfont00CC5F"}>已绑定</span> :
<span className={"color-red"}>未绑定</span>}
),
},
{
title: '手机绑定',
key: 'mobile',
dataIndex: 'mobile',
render: (text, record) => (
<span>
{record.phone_binded===true?<span className={"pdfdownloadfont00CC5F"}>已绑定</span>:<span className={"color-red"}>未绑定</span>}
</span>
),
},
{
title: '邮箱绑定',
key: 'mail',
dataIndex: 'mail',
render: (text, record) => (
<span>
{record.email_binded === true ? <span className={"pdfdownloadfont00CC5F"}>已绑定</span> :
<span className={"color-red"}>未绑定</span>}
),
},
{
title: '邮箱绑定',
key: 'mail',
dataIndex: 'mail',
render: (text, record) => (
<span>
{record.email_binded===true?<span className={"pdfdownloadfont00CC5F"}>已绑定</span>:<span className={"color-red"}>未绑定</span>}
</span>
),
},
),
},
{
title: '开户行及银行卡号信息（队长填写）',
key: 'idcard',
dataIndex: 'idcard',
render: (value, record, index) => {
if (index === 0 && record.bank_account != null) {
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>,
};
}
},
},
];
];
let people = [{url: '/api/competitions/xxxxx/certificates/1/personal'},
{url: '/api/competitions/xxxxx/certificates/2/personal'},]
let people=[ { url: '/api/competitions/xxxxx/certificates/1/personal' },
{ url: '/api/competitions/xxxxx/certificates/2/personal' },]
return (
<React.Fragment>
<Row>
@ -149,16 +140,13 @@ 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> :
data && data.personal_certifications.map((item, key) => {
return (
<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>
<img src={ getImageUrl(`images/educoder/pdfs.png`)} />
<a className={"pdfdownloadfont4CACFF ml10"} href={item.url} download=""
title="下载" mce_href="#">立即下载</a>
</span>
)
})}</Col>
@ -166,19 +154,19 @@ class CompetitionContentspdfdownload extends Component {
<Row className={"mt30"}>
<Col>团队证书：
{data && data.team_certifications.length === 0 ? <span className={"pdfpicture font-14"}>暂未生成</span>
: data && data.team_certifications.map((item, key) => {
return (
{data&&data.team_certifications.length===0?<span className={"pdfpicture font-14"}>暂未生成</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>
<img src={ getImageUrl(`images/educoder/pdfs.png`)} />
<a className={"pdfdownloadfont4CACFF ml10"} href={item.url} download=""
title="下载" mce_href="#">立即下载</a>
</span>
)
})}
</Col>
</Row>
<Divider/>
<Divider />
<style>
{
`
@ -195,13 +183,12 @@ class CompetitionContentspdfdownload extends Component {
`
}
</style>
{teams && teams.map((item, key) => {
return (
{teams&&teams.map((item,key)=>{
return(
<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;
export default CompetitionContentspdfdownload;
Write Preview
Loading…
Cancel
Save