Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022

src/home/Slider/index.jsx

@@ -12,7 +12,7 @@ import './index.scss';
 
 let setting = {
   infinite: true,
-  speed: 28000,
+  speed: 21000,
   slidesToShow: 1,
   slidesToScroll: 1,
   autoplaySpeed: 0,
@@ -34,7 +34,7 @@ function SecondSection() {
 
 
   return (
-    <div className="home-competition-slide">
+    <div className="home-competition-slide homepage-main">
       <Slider {...setting}>
 
         <div>

src/home/Slider/index.scss

@@ -1,8 +1,5 @@
 .home-competition-slide {
   position: relative;
-  // height: 50px;
-  width: 100vw;
-  padding:0 500px;
   overflow: hidden;
   top: 4.375em;
   left: 0;
@@ -11,9 +8,8 @@
 
   .competition-slide-item {
     display: flex;
-    justify-content: flex-end;
+    justify-content: center;
     height: 2.6vw;
-    width: calc(100vw + 1000px);
   }
 
   .competition-notice {

src/military/qz2022.js

@@ -100,14 +100,16 @@ const Qz2022 = (props) => {
     }
   }, []);
 
-  useEffect(()=>{
-    let footer=document.querySelector('.newFooter');
-    if((footer.offsetTop +107)<window.screen.height){
-      footer.style.position="absolute";
-    }else{
-      footer.style.position="relative";
-    }
-  },[history])
+  // useEffect(()=>{
+  //   let footer=document.querySelector('.newFooter');
+  //   let loading=document.querySelector('..ant-spin-nested-loading');
+  //   if((footer.offsetTop +107)<window.screen.height){
+  //     footer.style.position="absolute";
+  //     loading.margin-b
+  //   }else{
+  //     footer.style.position="relative";
+  //   }
+  // },[history])
 
   function scrollListener() {
     let qz2022Top = document.querySelector('.qz2022').offsetTop;
@@ -171,7 +173,7 @@ const Qz2022 = (props) => {
             <Link to={{ pathname: `/competition/qz2022/introduce` }}>首页</Link>
           </li>
           <li className={active === "fingerpost" ? "active" : ""}>
-            <Link to={{ pathname: `/competition/qz2022/fingerpost` }}>{is_local?'赛事指南':'大赛简介'}</Link>
+            <Link to={{ pathname: `/competition/qz2022/fingerpost` }}>赛事指南</Link>
           </li>
           <li className={active === "notice" ? "active" : ""}>
             <Link to={{ pathname: `/competition/qz2022/notice` }}>通知公告</Link>

src/military/qz2022/index.scss

@@ -110,6 +110,7 @@
 }
 .manageEdit{
   text-align: right;
+  margin-bottom: 10px;
 }
 // 按钮样式
 .but_2e5 {

src/military/qz2022/introduce/index.jsx

@@ -18,10 +18,12 @@ function Introduce({ qzDetail, current_user }) {
       </div>}
       <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">
-            <RenderHtml value={content} className="info-content"/>
-          </div>
+          {/* <div className="introduce-video"> */}
+            <video className="introduce-video" src={video_url} autoPlay controls muted></video>
+          {/* </div> */}
+          {/* <div className="introduce-info"> className="info-content"*/}
+            <RenderHtml value={content} />
+          {/* </div> */}
         </div>
       </div>
     </div>

src/military/qz2022/introduce/index.scss

@@ -4,59 +4,66 @@
 }
 .introduce {
   width: 100%;
-  height: 36.3vw;
   background-image: url("../image/introduce.png");
-  background-size: 100% 100.5%;
+  background-size: 100% 100%;
+  background-color:#f1f7fc;
+  padding-bottom: 4%;
 
   .introduce-content {
     width: 62.5%;
     height: 100%;
     margin: 0 auto;
     // padding: 2.75% 2% 5% 2.5%;
-    padding: 4.5% 2% 5% 2%;
+    padding: 2%;
     box-sizing: border-box;
+    background: #fff;
   }
   .introduce-video {
-    height: 80%;
     margin-right: 2.2%;
     min-width: 30%;
     max-width: 62.5%;
     float: left;
-    video {
-      width: 100%;
-      max-width: 100%;
-      max-height: 100%;
-    }
+    // video {
+    //   width: 100%;
+    //   max-width: 100%;
+    //   max-height: 100%;
+    // }
   }
 
-  .introduce-info {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    min-width: 35%;
-    min-height: 75%;
-    position: relative;
+  // .introduce-info {
+  //   // display: flex;
+  //   // flex-direction: column;
+  //   // justify-content: center;
+  //   // min-width: 35%;
+  //   // min-height: 75%;
+  //   // position: relative;
 
    
-    .manageEdit{
-      text-align: left;
-      position: absolute;
-      bottom: -36px;
-    }
-    .info-content{
-      height: 25rem;
-      // overflow-y: auto;
-    }
+  //   .manageEdit{
+  //     text-align: left;
+  //     position: absolute;
+  //     bottom: -36px;
+  //   }
+  //   // .info-content{
+  //   //   height: 25rem;
+  //   //   overflow: auto;
+  //   //   // overflow-y: auto;
+  //   // }
+    
 
-    p{
-      text-overflow: -o-ellipsis-lastline;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 14;
-      line-clamp: 14;
-      -webkit-box-orient: vertical;
-    }
+  //   p{
+  //     text-overflow: -o-ellipsis-lastline;
+  //     overflow: hidden;
+  //     text-overflow: ellipsis;
+  //     display: -webkit-box;
+  //     -webkit-line-clamp: 14;
+  //     line-clamp: 14;
+  //     -webkit-box-orient: vertical;
+  //   }
+  // }
+
+  .markdown-body{
+      overflow: visible;
   }
 
   .info-tit {

src/modules/tpm/TPMIndex.css

@@ -52,6 +52,13 @@ body>.-task-title {
 .indexHOC > .ant-spin-nested-loading {
   /* background: #000; */
   height: 100%;
+  margin-bottom: 107px;
+}
+.indexHOC .homePage+.ant-spin-nested-loading {
+  margin-bottom: 0;
+}
+.newFooter{
+  position:absolute !important;
 }
 .indexHOC > .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot {
   top: 50% !important;