修改竞赛

src/home/Slider/index.scss

@@ -10,6 +10,7 @@
   .competition-slide-item {
     display: flex;
     justify-content: flex-end;
+    height: 2.6vw;
   }
 
   .competition-notice {

src/military/components/login/index.jsx

@@ -85,7 +85,7 @@ export default ({ current_user, showLoginDialog }) => {
                 <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
                     <a href={`/users/${current_user === undefined ? "" : current_user.login}/courses`}>
                         <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                            src={getImageUrl(`images/` + current_user.image_url)} width="34">
+                            src={getImageUrl(current_user.image_url)} width="34">
                         </img>
                     </a>
                     <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>

src/military/qz2022.js

@@ -9,7 +9,8 @@ import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
 import './qz2022/index.scss';
 import { Menu, Popover, Spin } from "antd";
-import banner from './qz2022/image/banner.png'
+import banner from './qz2022/image/banner.jpg';
+import banner_local from './qz2022/image/banner_local.jpg';
 import { getQz2022, userCompetitionStatus } from "./qz2022/api";
 import { paths } from "./qz2022/static";
 import Login from './components/login';
@@ -146,19 +147,21 @@ const Qz2022 = (props) => {
     }
   }
 
+  const is_local= qzDetail &&qzDetail.is_local;
+
   return (
     <React.Fragment>
       <Login {...props} />
       {/* banner图+选项 */}
-      <img src={banner} className="qz_banner"/>
+      <img src={is_local?banner_local: banner} className="qz_banner"/>
       <div className="qz2022">
         <div className={`qz2022-top ${fixedTop}`}>
         {paths.indexOf(active) !== -1 && <ul className="qz2022Menu mt20 qz_main">
           <li className={ active==='qz2022' ||active === "introduce"? "active" : ""}>
-            <Link to={{ pathname: `/competition/qz2022/introduce` }}>大赛介绍</Link>
+            <Link to={{ pathname: `/competition/qz2022/introduce` }}>首页</Link>
           </li>
           <li className={active === "fingerpost" ? "active" : ""}>
-            <Link to={{ pathname: `/competition/qz2022/fingerpost` }}>大赛指南</Link>
+            <Link to={{ pathname: `/competition/qz2022/fingerpost` }}>{is_local?'赛事指南':'大赛简介'}</Link>
           </li>
           <li className={active === "notice" ? "active" : ""}>
             <Link to={{ pathname: `/competition/qz2022/notice` }}>通知公告</Link>

src/military/qz2022/contact/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import contactPng from "../image/contact.png";
+import contactPng from "../image/qz-logo.png";
 import RenderHtml from "src/components/render-html";
 import Link from "react-router-dom/Link";
 import { Button } from "antd";
@@ -15,11 +15,11 @@ function Contact({ aboutUs, qzDetail, current_user }) {
         <Link to={"/competition/qz2022/contact/edit"}><Button><i className="iconfont icon-a-bianji11 font-13 mr5"></i>编辑</Button></Link>
       </div>}
       <div className="contact qz_main">
-        <div className="contact-words">
-          <RenderHtml value={aboutUs} className="contact-content"/>
-        </div>
         <div className="contact-png">
-          <img  src={contactPng} ></img>
+          <img src={contactPng} ></img>
+        </div>
+        <div className="contact-words">
+          <RenderHtml value={aboutUs} className="contact-content" />
         </div>
       </div>
     </div>

src/military/qz2022/contact/index.scss

@@ -8,12 +8,12 @@
   padding: 3rem;
   background: #fff;
   display: flex;
-  justify-content: space-between;
-  
+  justify-content: space-around;
+  align-items: center;
   
   .contact-png{
-    width: 55%;
-    margin-left:1rem;
+    width: 50%;
+    margin-right:1rem;
     img{
       width: 100%;
     }
@@ -41,7 +41,7 @@
     font-size: 1rem;
     line-height: 2rem;
     margin-bottom: 1rem;
-    height: 16rem;
-    // overflow-y: auto;
+    // height: 16rem;
+    overflow: visible;
   }
 }

src/military/qz2022/fingerpost/index.scss

@@ -11,5 +11,6 @@
     }
     .fingerpost_cont{
         padding-bottom: 50px;
+        font-family: 'fangsongGB2312';
     }
 }

src/military/qz2022/index.scss

@@ -1,3 +1,16 @@
+@font-face {
+  font-family: fangsongGB2312;
+  src: url('./public/fonts/fangsongGB2312.ttf');
+}
+
+@font-face {
+  font-family: fzxbs;
+  src: url('./public/fonts/FZXBSJW.TTF');
+}
+@font-face {
+  font-family: kaitiGB2312;
+  src: url('./public/fonts/kaitiGB2312.ttf');
+}
 // 启智2022主页样式
 .qz_banner {
   width: 100%;

src/military/qz2022/introduce/index.scss

@@ -35,6 +35,8 @@
     min-width: 35%;
     min-height: 75%;
     position: relative;
+
+   
     .manageEdit{
       text-align: left;
       position: absolute;
@@ -44,6 +46,16 @@
       height: 25rem;
       // 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;
+    }
   }
 
   .info-tit {
@@ -59,6 +71,25 @@
     text-indent: 2em;
   }
 
+ 
+  @media screen and (min-width: 1800px) {
+    .introduce-video{
+      width: 62.5%;
+    }
+    .introduce-info .markdown-body p{
+      font-size: 18px !important;
+      line-height: 1.4;
+    }
+  }
+
+  @media screen and (min-width: 2500px) {
+    .introduce-info .markdown-body p{
+      font-size: 20px !important;
+      line-height: 1.4;
+    }
+  }
+
+
   @media screen and (max-width: 1700px) {
     .info-tit {
         line-height: 1.5;
@@ -75,5 +106,16 @@
     .content-item {
       font-size: .9rem;
     }
+    .introduce-info p{
+      font-size: 14px !important;
+      line-height: 1.4;
+    }
+  }
+
+
+  @media screen and (max-width: 1300px) {
+     .introduce-info .markdown-body p{
+      font-size: 13px !important;
+    }
   }
 }

src/military/qz2022/notice/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { Button, Modal, Popover, Menu, message } from 'antd';
 import { Link } from "react-router-dom";
-
+import notice from '../image/notice.gif';
 import './index.scss';
 import '../../index.scss';
 import { getNoticeList, deleteQz2022Notice } from "../api";
@@ -43,7 +43,7 @@ function Notice({ current_user, qzDetail }) {
       <div className="qz_main not">
         {noticeList && noticeList.map(item=>{
           return <div className="qz_notice_cont" key={item.id}>
-            {manageEdit && <div className="head">
+            {manageEdit && <div className="head"><img className="notice-new" src={notice}/>
               <Link to={`/competition/qz2022/notice/detail/${item.id}`} className="notCont_head">{item.title}</Link>
               <Popover content={<Menu>
                 <Menu.Item>

src/military/qz2022/notice/index.scss

@@ -20,13 +20,17 @@
         padding: 18px 30px 25px 20px;
         color:#2e3341;
         margin-top: 30px;
-        >.head{
+        .head{
             display: flex;
-            justify-content: space-between;
             padding-bottom: 10px;
             margin-bottom: 10px;
             border-bottom: 1px solid rgba(153, 153, 153, 0.2);
             >span{cursor: pointer;}
+
+            .notice-new{
+                position: relative;
+                top:8px;
+            }
         }
         .notCont_head{
             font-weight:bold;