diff --git a/src/military/competition.js b/src/military/competition.js index 2b773178..60888d75 100644 --- a/src/military/competition.js +++ b/src/military/competition.js @@ -149,7 +149,7 @@ const Qz2022 = (props) => { props.showNotification("您还未报名竞赛!"); } else if (enrollStatus && enrollStatus.status === 0) { props.showNotification("报名信息被管理员驳回!"); - } else if (competitionId=='ccks'&& enrollStatus && enrollStatus.status === 1) { + } else if (['ccks','zstp2022'].includes(competitionId)&& enrollStatus && enrollStatus.status === 1) { props.showNotification("您的报名信息未通过审核!"); } else { !referStatus ? props.showNotification(!referEnd ? `竞赛尚未开始提交作品,提交作品开始时间为:${qzDetail && qzDetail.enroll_date.substring(0, 10)}` : "比赛已结束") : ""; @@ -163,7 +163,7 @@ const Qz2022 = (props) => { {/* banner图+选项 */} - + {banner_url&&} {pathname.indexOf("qz2022")>-1 && }
diff --git a/src/military/competition/apply/ccks.jsx b/src/military/competition/apply/ccks.jsx index cba57682..95100aba 100644 --- a/src/military/competition/apply/ccks.jsx +++ b/src/military/competition/apply/ccks.jsx @@ -474,7 +474,7 @@ export default Form.create()((props) => {
:''}
- {enrollStatus && enrollStatus.enroll_info.status == 2 && ( + {enrollStatus && enrollStatus.enroll_info.status == 2 &&qzDetail && qzDetail.enroll_template&& (
{ if (response && response.status === 200) { setTotal(response.data.count); @@ -260,14 +261,14 @@ function Introduce({ history: { location: { pathname } }, qzDetail, match }) {
- { setSearchValue(e.target.value) }} onSearch={value => { setCurPage(1); setKeyword(value) }} allowClear enterButton style={{ width: 300, marginRight: "30px" }} /> - 审核状态: + { setSearchValue(e.target.value) }} onSearch={value => { setCurPage(1); setKeyword(value) }} allowClear enterButton style={{ width: 300, marginRight: "30px" }} /> + {type === "applys"&&审核状态: + }