diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 82c18a09d..25a6ab9c7 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -354,7 +354,7 @@ class TPMBanner extends Component { //开始实战按钮 startshixunCombat=(id)=>{ let {shixunsDetails} = this.props - if( shixunsDetails.status>1){ + if( shixunsDetails.shixun_status>1){ this.setState({ startbtn:true, hidestartshixunsreplacevalue:"" @@ -463,11 +463,11 @@ class TPMBanner extends Component { // // } if(shixunsDetails!=undefined){ - if (shixunsDetails.status === 0 ) { + if (shixunsDetails.shixun_status === 0 ) { challengeBtnText = '继续实战' - } else if (shixunsDetails.status === 1) { + } else if (shixunsDetails.shixun_status === 1) { challengeBtnText = '查看实战' - } else if (shixunsDetails.status === 3) { + } else if (shixunsDetails.shixun_status === 3) { challengeBtnText = '继续实战' }else{ challengeBtnText = "开始实战" @@ -640,7 +640,7 @@ class TPMBanner extends Component { className="fr user_default_btn task-btn-orange font-18" id="shixun_operation" data-remote="true" > - {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.task_operation[0]} + {shixunsDetails.task_operation === undefined ? "" : shixunsDetails.shixun_status > 1 ? shixunsDetails.task_operation[0] : "模拟实战"} : "" @@ -707,7 +707,7 @@ class TPMBanner extends Component { {/*>{shixunsDetails.task_operation===undefined?"":shixunsDetails.task_operation[0]}:""*/} {/*}*/} - {shixunsDetails.status === 0 && this.props.identity < 4 ? + {shixunsDetails.shixun_status === 0 && this.props.identity < 4 ? 申请发布 : "" } @@ -772,7 +772,7 @@ class TPMBanner extends Component { - {shixunsDetails.status === 1 && this.props.identity < 4 ? + {shixunsDetails.shixun_status === 1 && this.props.identity < 4 ? 撤销发布 : "" } @@ -781,7 +781,7 @@ class TPMBanner extends Component { 发送至 @@ -847,7 +847,7 @@ class TPMBanner extends Component { - {shixunsDetails.status === 3 && + {shixunsDetails.shixun_status === 3 && 已关闭 } @@ -918,7 +918,7 @@ class TPMBanner extends Component {
正在等待管理员的审核。在审核通过前,可以随时撤销发布
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 49d7cf016..09bab590d 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -239,7 +239,7 @@ class Challenges extends Component {

简介 - @@ -249,7 +249,7 @@ class Challenges extends Component {

- {ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?"": + {ChallengesDataList === undefined ? "" :ChallengesDataList&&ChallengesDataList.description===null?"":

}

@@ -262,7 +262,7 @@ class Challenges extends Component {

全部任务 - {this.props.identity < 4 && this.props.status === 0 ? + {this.props.identity < 4 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ? : "" } - {this.props.identity < 4 && this.props.status === 0 ? + {this.props.identity < 4 && ChallengesDataList&&ChallengesDataList.shixun_status=== 0 ? this.delOperations(item.challenge_id)} - style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }} + style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }} className="fl ring-op-green mr25"> @@ -371,7 +371,7 @@ class Challenges extends Component { {item.up_url != undefined && this.operations(item.challenge_id, "up")} - style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }} + style={{ display:this.props.user.admin===true?"block":this.props.identity < 4 && ChallengesDataList.shixun_status === 0 ? "block" : 'none' }} className="fl ring-op-green mr25"> @@ -381,7 +381,7 @@ class Challenges extends Component { {item.down_url != undefined && this.operations(item.challenge_id, "down")} - style={{ display: this.props.user.admin===true?"block":this.props.identity < 4 && this.props.status === 0 ? "block" : 'none' }} + style={{ display: this.props.user.admin===true?"block":this.props.identity < 4 && ChallengesDataList.shixun_status=== 0 ? "block" : 'none' }} className="fl ring-op-green mr25"> @@ -393,7 +393,7 @@ class Challenges extends Component { item.st === 1 ?