diff --git a/public/react/package.json b/public/react/package.json index 5bc10f627..e43132877 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -77,6 +77,7 @@ "react-redux": "5.0.7", "react-router": "^4.2.0", "react-router-dom": "^4.2.2", + "react-split-pane": "^0.1.87", "react-url-query": "^1.4.0", "redux": "^4.0.0", "redux-thunk": "2.3.0", diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js index a379f2607..218e8497f 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdf.js @@ -17,7 +17,14 @@ class CompetitionContentspdf extends Component{ componentDidMount(){ window.document.title = '竞赛'; - + let query=this.props.location&&this.props.location.search; + const types = query.split('user_id=') + if(types[1]===undefined){ + }else{ + this.setState({ + Tabskey:"2" + }) + } } Competitioncallback=(key)=>{ @@ -54,4 +61,4 @@ class CompetitionContentspdf extends Component{ ) } } -export default CompetitionContentspdf; \ No newline at end of file +export default CompetitionContentspdf; 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 aa550c0c5..8640b115c 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js @@ -340,7 +340,11 @@ class CompetitionContentspdfpeopledata extends Component { render() { - const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state + const admins=this.props.user.admin; + if(admins===undefined||admins===null) { + admins === false; + } + const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state return (