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
杨树明 6 years ago
parent bcfe2df1dd 936922ba6b
commit dd74208183
2 changed files with 110 additions and 126 deletions
Show Stats Download Patch File Download Diff File

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

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

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

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