Merge pull request '修改首页通知弹框' (#398) from tongChong/forgeplus-react:dev_military_admin into pre_dev_military

src/home/QzModal/index.jsx

@@ -2,8 +2,9 @@ import React, { memo, useEffect, useState } from 'react';
 import { Button, Modal } from 'antd';
 import { Link } from 'react-router-dom';
 
-import bg from '../img/modal.png';
-import bg_local from '../img/modal_local.png';
+// import bg from '../img/modal.png';
+import bg from '../img/ckds.jpg';
+// import bg_local from '../img/modal_local.png';
 import './index.scss';
 
 
@@ -37,9 +38,9 @@ function QzModal() {
       width='728px'
       maskClosable={false}
     >
-      <img src={window.location.href.indexOf('osredm.jk')>-1?bg_local: bg} />
-
-      <Link to="/competition/qz2022" className="qz-btn">查看详情</Link>
+      {/* <img src={window.location.href.indexOf('osredm.jk')>-1?bg_local: bg} /> */}
+      <img src={bg} />
+      <a target="_blank" href="https://ckds.osredm.com" className="qz-btn">查看详情</a>
     </Modal>
   )
 }

src/home/QzModal/index.scss

@@ -6,6 +6,7 @@
 
     img {
       border-radius: 2px;
+      width: 100%;
     }
   }
 

src/home/index.jsx

@@ -4,7 +4,7 @@ import { isMobile } from 'educoder';
 import './index.scss';
 
 import Slider from './Slider';
-// import QzModal from './QzModal';
+import QzModal from './QzModal';
 import FirstSection from './FirstSection';
 import SecondSection from './SecondSection';
 import ThirdSection from './ThirdSection';
@@ -129,7 +129,7 @@ function HomePage({ history }) {
     <div className="homePage">
 
       <Slider />
-      {/* <QzModal /> */}
+      <QzModal />
       <div id="home-first-section" className="home-first-section">
         <FirstSection first={first} />
       </div>