From 03bdd37b2fcabaa1764ed50a18150f6673827d4b 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 18:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=AB=9E=E8=B5=9B=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=87=B3=E5=86=85=E7=BD=91=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/qz2022/image/btn-right.png | Bin 0 -> 1377 bytes
 src/military/qz2022/introduce/index.jsx |  27 ++++--------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 create mode 100644 src/military/qz2022/image/btn-right.png

diff --git a/src/military/qz2022/image/btn-right.png b/src/military/qz2022/image/btn-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0566f17af59cfbe7bc5e1615c68dbdc1dd322aee
GIT binary patch
literal 1377
zcmV-n1)lneP)<h;3K|Lk000e1NJLTq003eD002-31^@s6;uoN(00004XF*Lt006O%
z3;baP0000uWmrjOO-%qQ0000800D<-00aO40096102%-Q00002paK8{000010001D
zpaTE|000010000`00000|K?RS000EkNkl<ZcmeI5UrQ8G7{=d8%QP%X(@c{nwSv;3
zBKnJ(-2`>heL-FXeSoa=rn~3^q(*w(Mbu4yhzJbIiikk)uKET+5kv&KJ@2j~<Ie0h
zJ9B2vIXmxxad&6-ob#UNH|KqJW@kqtDMl#ZBo#$2m#ayt?P_Y*ahwGnPa+@y;WFBu
zswTk_97`8qd|j1L2WJv$w`!YJ4g#}*XW3xYDwfc|l!HK=eOOu&innT;O#+0Zr3kxA
z5+H^m#F6<bN<qLM>Y(V!%&Qtf0Hq+%|8Xq!5#q>v71bcbA0qBj0wSVts;emj0e{$p
z;0~w`Fe~jT0|CKKV^P^&Rv6^RsZu!chZwt#N)S9Fq(oFe2?+SZPV~PcVhmCZ3Mc`A
zcI0R}=I*2lg!qGQ5J*c5b0B6MnXj&5MjV8Sd<-Eah5{-;NLq>kz^y7ETqQI=#sUF<
zXh8f&HIJbxx{n0{3Y@~i-$6);sX$y1a{LezfLlE-2r+6`$(WCkLBJpQN{xLn`<LoV
z3e?6>g40qWR|>|6i5|@mz5Yzpy^U!29KN@;#KGc#FfJ`U283Jpb9s(4pNMAX9GbjN
z)X1Oh3@?#W6UJqnQO{r|c+32^99_9h^y{~Gt(ngwfq*~k#&9}J8`7>$e?+#xhy((|
zH7+eNg5mQ-`+NMhWdn?;AdE{(45Dr|(fBnxVN?tPX^9QKp9gMYX;^C~jEX@({3BS_
zn+U;;$%WC^ZBLqt0>a3&<U(*C8OFp2ej{KBj3^+CG-?-s_tB=AQ4t9ELn8*tsmYqM
z4wpo;f%h6dGb#cB_4~1~SzA>Y#zYwySMLxlEb1Lnr68<HOU1G-!|3uG_}rHqz4};O
zBi+}Pg0RA<OG#J{18-{%-umZn@cOjYh6VwDXh%?c(h5v<KZ`gQc=ImNi}!_-g5LH!
zS{xcW>|K-o^Uxp=nzd;u4`H0>`8z*^wq}R!-5}ymSUO83AgoMF%MfORAxw=DwQtsm
zpwM?!gJ1}wJQD&SY-w`H6bOtW6bSf3FW%c)U}wi)7s9g=5T?h>m<g_$p+MlxR;49|
zFg8JC3j~G{7KAlMom+zN^sV0$I31Zb6GG1jq@^`@Ghaw%MH!nU3WCsTm?spA8D>Tt
zLnRBoekXeHlIY1B|4d*A)A)4M(Na8ob6$r5VNF{4Fz*-E1_&H=7!cMN^<MrZpQqRY
zfkUqK#O-?uf7pnXhkP3hU2*9w(f1!t{sOZuTw^kFk!Wj)b4#WT!G9{!6Cprcz{`i8
zRq|B50-^5dXH8mCuTQ!y{?8+<G3s<>Q{P)j5J*eg(Or@KsSiL}EGSSC1UAcTNO3O_
z5GjgXuB$*0NK3qauv|sirdEMK5a@z$fYqe7D`~Bq0;NERKa^7~fo-Kg$nir0VwY>u
z2Lk?p%dzse4J}tswkcM?2LkP%z@qt@2F0Vapt&Fr;tv|Y2?!0M2X(mu1pI-o@Zo<u
zASGo5R)9d?e5cB?r^Zu`FEia0gAjkvguWPr96#s=0e|R044s<d$b7fn86mSl<L=-E
zA^xBn1kzFsVi?dEN9MbBX9WLVW<%!H&?tZlLei2(2;6o4;0>vXuWhyDUSFCOQ{Vkh
j{IAkQ_039)krem`LYe>zM0au%00000NkvXXu0mjf=732F

literal 0
HcmV?d00001

diff --git a/src/military/qz2022/introduce/index.jsx b/src/military/qz2022/introduce/index.jsx
index 07505729..a0c7ed7e 100644
--- a/src/military/qz2022/introduce/index.jsx
+++ b/src/military/qz2022/introduce/index.jsx
@@ -8,36 +8,17 @@ function Introduce({ 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">
-<<<<<<< HEAD
-<<<<<<< HEAD
-          <div className="info-tit">“启智”2022作战概念·JSJSJS需求创新大赛</div>
-=======
-          <div className="info-tit">“启智-2022”作战概念·JSJSJS需求创新大赛</div>
->>>>>>> 2805cd0d (修改样式等)
-          <div className="info-content" dangerouslySetInnerHTML={{ __html:content}}>
-          </div>
-=======
           <h3 className="info-tit">“启智-2022”作战概念·事需求创新大赛</h3>
-          {/* <div className="info-content"> */}
-          <p className="content-item">创客以用户创新为核心理念，是面向知识社会
-            的创新2.0模式在设计与制造领域的典型体现。创
-            客运动最重要的标志是掌握了自生产工具，
-            他们是一群新人类。</p>
+          <div className="info-content" dangerouslySetInnerHTML={{__html:content}}>
+         
+          </div>
 
-          <p className="content-item">在中文里，“创”的含义是：
-            开始做，创造，首创，开创，创立。它体现了一种
-            积极向上的生活态度。</p>
-          <p className="content-item">
-            同时有一种通过行动和实践去发现问题和需求，
-            并努力找到解决方案的含义...</p>
-          {/* </div> */}
-
->>>>>>> cbbf17c2 (定制竞赛-issue)
         </div>
 
       </div>