diff --git a/build.zip b/build.zip
new file mode 100644
index 000000000..2ad778874
Binary files /dev/null and b/build.zip differ
diff --git a/public/fonts/FZXBSJW.TTF b/public/fonts/FZXBSJW.TTF
new file mode 100644
index 000000000..ac27db792
Binary files /dev/null and b/public/fonts/FZXBSJW.TTF differ
diff --git a/public/fonts/fangsongGB2312.ttf b/public/fonts/fangsongGB2312.ttf
new file mode 100755
index 000000000..16eb427c4
Binary files /dev/null and b/public/fonts/fangsongGB2312.ttf differ
diff --git a/public/fonts/kaitiGB2312.ttf b/public/fonts/kaitiGB2312.ttf
new file mode 100644
index 000000000..ece2ac2c0
Binary files /dev/null and b/public/fonts/kaitiGB2312.ttf differ
diff --git a/src/home/Slider/index.scss b/src/home/Slider/index.scss
index 3ef514546..1385a0ce4 100644
--- a/src/home/Slider/index.scss
+++ b/src/home/Slider/index.scss
@@ -10,6 +10,7 @@
.competition-slide-item {
display: flex;
justify-content: flex-end;
+ height: 2.6vw;
}
.competition-notice {
diff --git a/src/military/components/login/index.jsx b/src/military/components/login/index.jsx
index 3ce2dd049..8fdbf1c98 100644
--- a/src/military/components/login/index.jsx
+++ b/src/military/components/login/index.jsx
@@ -85,7 +85,7 @@ export default ({ current_user, showLoginDialog }) => {
+ src={getImageUrl(current_user.image_url)} width="34">
diff --git a/src/military/qz2022.js b/src/military/qz2022.js
index fe6e54d43..6a1653e61 100644
--- a/src/military/qz2022.js
+++ b/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 (
{/* banner图+选项 */}
-
+
{paths.indexOf(active) !== -1 &&
-
- 大赛介绍
+ 首页
-
- 大赛指南
+ {is_local?'赛事指南':'大赛简介'}
-
通知公告
diff --git a/src/military/qz2022/contact/index.jsx b/src/military/qz2022/contact/index.jsx
index caebe5821..3aac93901 100644
--- a/src/military/qz2022/contact/index.jsx
+++ b/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 }) {
}
-
-
-
-

+

+
+
+
diff --git a/src/military/qz2022/contact/index.scss b/src/military/qz2022/contact/index.scss
index d0bc0a71d..8e03b4283 100644
--- a/src/military/qz2022/contact/index.scss
+++ b/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;
}
}
diff --git a/src/military/qz2022/fingerpost/index.scss b/src/military/qz2022/fingerpost/index.scss
index d2c171958..372adab1f 100644
--- a/src/military/qz2022/fingerpost/index.scss
+++ b/src/military/qz2022/fingerpost/index.scss
@@ -11,5 +11,6 @@
}
.fingerpost_cont{
padding-bottom: 50px;
+ font-family: 'fangsongGB2312';
}
}
\ No newline at end of file
diff --git a/src/military/qz2022/image/banner.jpg b/src/military/qz2022/image/banner.jpg
new file mode 100644
index 000000000..a7191c46e
Binary files /dev/null and b/src/military/qz2022/image/banner.jpg differ
diff --git a/src/military/qz2022/image/banner_local.jpg b/src/military/qz2022/image/banner_local.jpg
new file mode 100644
index 000000000..593407806
Binary files /dev/null and b/src/military/qz2022/image/banner_local.jpg differ
diff --git a/src/military/qz2022/image/notice.gif b/src/military/qz2022/image/notice.gif
new file mode 100644
index 000000000..6a38d54d3
Binary files /dev/null and b/src/military/qz2022/image/notice.gif differ
diff --git a/src/military/qz2022/image/qz-logo.png b/src/military/qz2022/image/qz-logo.png
new file mode 100644
index 000000000..e1de504d3
Binary files /dev/null and b/src/military/qz2022/image/qz-logo.png differ
diff --git a/src/military/qz2022/index.scss b/src/military/qz2022/index.scss
index 76edd7192..e6695836d 100644
--- a/src/military/qz2022/index.scss
+++ b/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%;
diff --git a/src/military/qz2022/introduce/index.scss b/src/military/qz2022/introduce/index.scss
index 3c47553f6..34612b461 100644
--- a/src/military/qz2022/introduce/index.scss
+++ b/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;
+ }
}
}
diff --git a/src/military/qz2022/notice/index.jsx b/src/military/qz2022/notice/index.jsx
index eef3aeaed..9ce7b0949 100644
--- a/src/military/qz2022/notice/index.jsx
+++ b/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 }) {
{noticeList && noticeList.map(item=>{
return
- {manageEdit &&
+ {manageEdit &&
{item.title}
diff --git a/src/military/qz2022/notice/index.scss b/src/military/qz2022/notice/index.scss
index 98e93e352..a52ac34b4 100644
--- a/src/military/qz2022/notice/index.scss
+++ b/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;
diff --git a/src/military/qz2022/public/fonts/FZXBSJW.TTF b/src/military/qz2022/public/fonts/FZXBSJW.TTF
new file mode 100644
index 000000000..ac27db792
Binary files /dev/null and b/src/military/qz2022/public/fonts/FZXBSJW.TTF differ
diff --git a/src/military/qz2022/public/fonts/fangsongGB2312.ttf b/src/military/qz2022/public/fonts/fangsongGB2312.ttf
new file mode 100755
index 000000000..16eb427c4
Binary files /dev/null and b/src/military/qz2022/public/fonts/fangsongGB2312.ttf differ
diff --git a/src/military/qz2022/public/fonts/kaitiGB2312.ttf b/src/military/qz2022/public/fonts/kaitiGB2312.ttf
new file mode 100644
index 000000000..ece2ac2c0
Binary files /dev/null and b/src/military/qz2022/public/fonts/kaitiGB2312.ttf differ