From e2915a7b053e48543ed09464db86a602dc821427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Thu, 26 May 2022 08:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/competition.js                  | 4 ++--
 src/military/competition/apply/ccks.jsx      | 2 +-
 src/military/competition/management/ccks.jsx | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

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) => {
     <React.Fragment>
       <Login {...props} />
       {/* banner图+选项 */}
-      <img src={banner_url || (is_local ? banner_local : banner)} className="qz_banner" alt="" />
+      {banner_url&&<img src={banner_url } className="qz_banner" alt="" />}
       {pathname.indexOf("qz2022")>-1 && <InfoModal />}
       <div className="competition">
         <div className={`competition-top ${fixedTop}`}>
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) => {
                 </div>:''}
               </div>
 
-              {enrollStatus && enrollStatus.enroll_info.status == 2 && (
+              {enrollStatus && enrollStatus.enroll_info.status == 2 &&qzDetail && qzDetail.enroll_template&& (
                 <div className="download_box">
                   <a
                     href={
diff --git a/src/military/competition/management/ccks.jsx b/src/military/competition/management/ccks.jsx
index 3cfa22ec..8afaed7f 100644
--- a/src/military/competition/management/ccks.jsx
+++ b/src/military/competition/management/ccks.jsx
@@ -48,6 +48,7 @@ function Introduce({ history: { location: { pathname } }, qzDetail, match }) {
       })
     } else {
       // 提交作品列表
+      delete params.status;
       getQzProList(params, competitionId).then(response => {
         if (response && response.status === 200) {
           setTotal(response.data.count);
@@ -260,14 +261,14 @@ function Introduce({ history: { location: { pathname } }, qzDetail, match }) {
 
       <div className="search">
         <div className="font-14">
-          <Search placeholder={`输入单位/负责人${type === "applys" ? "/电话" : ""}进行搜索`} value={searchValue} onChange={(e) => { setSearchValue(e.target.value) }} onSearch={value => { setCurPage(1); setKeyword(value) }} allowClear enterButton style={{ width: 300, marginRight: "30px" }} />
-          <span>审核状态:  </span>
+          <Search placeholder={`输入单位/姓名/电话进行搜索`} value={searchValue} onChange={(e) => { setSearchValue(e.target.value) }} onSearch={value => { setCurPage(1); setKeyword(value) }} allowClear enterButton style={{ width: 300, marginRight: "30px" }} />
+          {type === "applys"&&<Fragment><span>审核状态:  </span>
           <Select value={status} style={{ width: 150 }} onChange={(value) => { setCurPage(1); setStatus(value) }}>
             <Option value=''>所有状态</Option>
             <Option value='0'>已驳回</Option>
             <Option value='1'>待审核</Option>
             <Option value='2'>已通过</Option>
-          </Select>
+          </Select></Fragment>}
         </div>
         <div>
           {type === "applys" && <a href={current_main_site_url + `/api/competition_infos/${competitionId}/enroll_template.zip`}><Button className="but_2e5 ml10">导出单位证明</Button></a>}