diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js index 8640b115c..a1504932b 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -25,7 +25,8 @@ class CompetitionContentspdfpeopledata extends Component { bank_account_editable: false, leader: false, bank_account: undefined, - certification: 1 + certification: 1, + userdata:undefined } } @@ -35,6 +36,33 @@ class CompetitionContentspdfpeopledata extends Component { console.log(this.props); this.getdata(); this.GetawardinformationAPI(); + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + let userid; + if(types[1]===undefined){ + userid=this.props.user&&this.props.user.user_id; + }else{ + userid=types[1]; + } + this.GetuseridApi(userid); + + } + + GetuseridApi=(id)=>{ + //个人信息API 获取个人信息 + let url = `/users/accounts/${id}.json`; + axios.get(url).then((result) => { + if (result.data) { + console.log("GetuseridApi"); + console.log(result.data); + this.setState({ + userdata:result.data + }) + } + }).catch((error) => { + console.log(error); + }) + } GetawardinformationAPI = () => { @@ -344,7 +372,7 @@ class CompetitionContentspdfpeopledata extends Component { if(admins===undefined||admins===null) { admins === false; } - const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state + const {updating, seconds, secondsFlag,userdata, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state return (
{this.state.certification === 1 ? @@ -366,10 +394,10 @@ class CompetitionContentspdfpeopledata extends Component {

*实名信息

- {basicInfo && basicInfo.authentication == "uncertified" ? + {userdata && userdata.authentication == "uncertified" ?

通过实名认证后才能获得证书

: "" } - {basicInfo && basicInfo.authentication == "uncertified" ? + {userdata && userdata.authentication == "uncertified" ?

this.checkBasicInfo(1)}>立即认证

: "" } @@ -377,11 +405,11 @@ class CompetitionContentspdfpeopledata extends Component {

姓名:

-

{basicInfo && basicInfo.name} +

{userdata && userdata.name} { - basicInfo && basicInfo.authentication == "uncertified" ? "" : - basicInfo && basicInfo.authentication == "applying" ? + userdata && userdata.authentication == "uncertified" ? "" : + userdata && userdata.authentication == "applying" ?

待审核!

性别:

-

{basicInfo && basicInfo.gender == 0 ? "男" : "女"}

+

{userdata && userdata.gender == 0 ? "男" : "女"}

*职业信息

{ - basicInfo && basicInfo.professional_certification == "uncertified" ? + userdata && userdata.professional_certification == "uncertified" ?

通过职业认证后才能获得证书

: ""} { - basicInfo && basicInfo.professional_certification == "uncertified" ? + userdata && userdata.professional_certification == "uncertified" ?

this.checkBasicInfo(2)}>立即认证

: ""} @@ -418,11 +446,11 @@ class CompetitionContentspdfpeopledata extends Component {

职业:

{basicInfo && basicInfo.identity && identityMap[basicInfo.identity]} + className="fontcolorsyslhei flexdirections">{userdata && userdata.identity && identityMap[userdata.identity]} { - basicInfo && basicInfo.professional_certification == "uncertified" ? + userdata && userdata.professional_certification == "uncertified" ? "" : - basicInfo && basicInfo.professional_certification == "applying" ? + userdata && userdata.professional_certification == "applying" ?

待审核!

{basicInfo && basicInfo.technical_title ? "职称:" : ""}{basicInfo && basicInfo.student_id ? "学号:" : ""}

-

{basicInfo && (basicInfo.technical_title || basicInfo.student_id)}

+ className="fontcolorsyslhui1">{userdata && userdata.technical_title ? "职称:" : ""}{userdata && userdata.student_id ? "学号:" : ""}

+

{userdata && (userdata.technical_title || userdata.student_id)}

学校:

-

{basicInfo && basicInfo.school_name}

+

{userdata && userdata.school_name}

院系:

-

{basicInfo && basicInfo.department_name}

+

{userdata && userdata.department_name}

*联系方式 @@ -460,13 +488,13 @@ class CompetitionContentspdfpeopledata extends Component {

手机号:

{ - basicInfo && basicInfo.phone ? -

{basicInfo && basicInfo.phone}

+ userdata && userdata.phone ? +

{userdata && userdata.phone}

:

未绑定

}

this.phonebools()}>{basicInfo && basicInfo.phone ? (phonebool === false ? "更换" : "") : (phonebool === false ? "立即绑定" : "")}

+ onClick={() => this.phonebools()}>{userdata && userdata.phone ? (phonebool === false ? "更换" : "") : (phonebool === false ? "立即绑定" : "")}

{/*手机号绑定*/} { @@ -480,9 +508,9 @@ class CompetitionContentspdfpeopledata extends Component {

Email:

-

{basicInfo && basicInfo.mail}

+

{userdata && userdata.mail}

this.emailbools()}>{basicInfo && basicInfo.mail ? (emailbool === false ? "更换" : "") : (emailbool === false ? "立即绑定" : "")}

+ onClick={() => this.emailbools()}>{userdata && userdata.mail ? (emailbool === false ? "更换" : "") : (emailbool === false ? "立即绑定" : "")}

{ emailbool === false ? "" :