From 5b83144e2e9ddabbb035c258d9b2cd23d970711e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Wed, 30 Mar 2022 10:47:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/qz2022.js                   | 7 +++++--
 src/military/qz2022/introduce/index.jsx  | 7 +++++--
 src/military/qz2022/introduce/index.scss | 6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/military/qz2022.js b/src/military/qz2022.js
index 849b1eb1..d461094c 100644
--- a/src/military/qz2022.js
+++ b/src/military/qz2022.js
@@ -99,6 +99,9 @@ const Qz2022 = (props) => {
     applyStatus = Date.parse(new Date()) < Date.parse(new Date(qzDetail.enroll_date));
     referStatus = !applyStatus && Date.parse(new Date()) < Date.parse(new Date(qzDetail.upload_date));
   }
+
+  console.log(qzDetail);
+
   return (
     <React.Fragment>
       {/* banner图+选项 */}
@@ -148,7 +151,7 @@ const Qz2022 = (props) => {
             {/* 大赛介绍 */}
             <Route path="/competition/qz2022/introduce"
               render={
-                () => (<Introduce {...props} qzDetail={qzDetail||{}} />)
+                () => (<Introduce {...props} qzDetail={qzDetail} />)
               }
             ></Route>
             {/* 大赛指南 */}
@@ -214,7 +217,7 @@ const Qz2022 = (props) => {
             {/* 大赛介绍 */}
             <Route path="/competition/qz2022"
               render={
-                () => (<Introduce {...props} />)
+                () => (<Introduce {...props} qzDetail={qzDetail}/>)
               }
             ></Route>
           </Switch>
diff --git a/src/military/qz2022/introduce/index.jsx b/src/military/qz2022/introduce/index.jsx
index 0e10f2e2..974ff94d 100644
--- a/src/military/qz2022/introduce/index.jsx
+++ b/src/military/qz2022/introduce/index.jsx
@@ -5,14 +5,17 @@ import '../../index.scss';
 
 function Introduce({ qzDetail }) {
 
-  let { content, video_url } = qzDetail;
+  let content= qzDetail&&qzDetail.content;
+  let video_url= qzDetail&&qzDetail.video_url;
 
+  console.log(qzDetail);
   return (
     <div className="introduce">
       <div className="introduce-content clearfix">
         <div className="introduce-video"><video src={video_url} autoPlay controls muted></video></div>
         <div className="introduce-info">
-          <div className="info-content" dangerouslySetInnerHTML={{ __html:content||''}}>
+          <div className="info-tit">“启智”2022作战概念·JSJSJS需求创新大赛</div>
+          <div className="info-content" dangerouslySetInnerHTML={{ __html:content}}>
           </div>
         </div>
 
diff --git a/src/military/qz2022/introduce/index.scss b/src/military/qz2022/introduce/index.scss
index 8485008f..e8125955 100644
--- a/src/military/qz2022/introduce/index.scss
+++ b/src/military/qz2022/introduce/index.scss
@@ -9,7 +9,7 @@
     width: 62.5%;
     height: 100%;
     margin: 0 auto;
-    padding: 5% 2% 5% 2.5%;
+    padding: 2.75% 2% 5% 2.5%;
     box-sizing: border-box;
   }
   .introduce-video {
@@ -27,17 +27,17 @@
   .introduce-info {
     display: flex;
     flex-direction: column;
-    justify-content: space-around;
+    justify-content: center;
     min-width: 35%;
     min-height: 75%;
   }
 
   .info-tit {
-    font-family: PingFang SC;
     font-weight: 700;
     color: #2e3341;
     font-size: 1.25rem;
     letter-spacing: 0.1rem;
+    margin-bottom: 1rem;
   }
   .content-item {
     font-size: 1rem;