From 1162d7e7f45cbac7478aa4cb55f5ba672b4a5518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Thu, 31 Mar 2022 10:39:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/components/login/index.scss | 6 +++---
 src/military/qz2022/chat/index.jsx       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/military/components/login/index.scss b/src/military/components/login/index.scss
index 54e782a8..b7ee4d51 100644
--- a/src/military/components/login/index.scss
+++ b/src/military/components/login/index.scss
@@ -1,12 +1,12 @@
 .qz2022Container{
-    padding-top:0;
+    padding-top:0 !important;
     background:#fff ;
 }
 
 .qz-login{
     position: absolute;
-    right: 20px;
-    top: 20px;
+    right: 70px;
+    top: 0;
     color: #fff;
     .login-box{
         a:hover{
diff --git a/src/military/qz2022/chat/index.jsx b/src/military/qz2022/chat/index.jsx
index 72e261aa..a31f9638 100644
--- a/src/military/qz2022/chat/index.jsx
+++ b/src/military/qz2022/chat/index.jsx
@@ -33,7 +33,7 @@ function Chat({ form, showNotification, match, history }) {
       </div>
       {/*  style={{display:'flex', width: '1200px', margin:'30px auto',padding: '0 120px',justifyContent: 'space-between', background: 'white'}} */}
       {/*  style={{display:'flex',alignItems: 'center'}} */}
-      <div className="links">
+      <div className="links qz_main">
         <div onClick={() => { window.open('https://fc.osredm.com/forums/theme/107') }}>
           <img src={chat1}></img>
           <div>参赛咨询</div>

From d1676b811d4f7937326df39e296b14fcbb3258c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <hetongchong@csxjy.com>
Date: Thu, 31 Mar 2022 11:01:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/qz2022/contact/index.jsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/military/qz2022/contact/index.jsx b/src/military/qz2022/contact/index.jsx
index ffec4057..8d3e54fc 100644
--- a/src/military/qz2022/contact/index.jsx
+++ b/src/military/qz2022/contact/index.jsx
@@ -13,13 +13,6 @@ function Contact({ aboutUs }) {
       <div className="contact qz_main">
         <div className="contact-words">
           <RenderHtml value={aboutUs} className="contact-content" />
-          {/* <p>主办方：JWJWJW联合参谋部、科学技术委员会</p>
-          <p>协办方：军事科学院、航天科技集团</p> */}
-          {/* <div className="contact-content">
-          <p>地址：北京市海淀区西三环北路72号</p>
-          <p>Email：osredm@163.com</p>
-          <p>电话：+86-010-66357650</p>
-        </div> */}
         </div>
         <div className="contact-png">
           <img src={contactPng} ></img>

From f1309a58d52ea26ffd286f187abd332387b0984c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com>
Date: Fri, 1 Apr 2022 09:20:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/qz2022/apply/index.jsx | 2 +-
 src/military/qz2022/chat/index.jsx  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/military/qz2022/apply/index.jsx b/src/military/qz2022/apply/index.jsx
index a6e7af92..1e9cbe95 100644
--- a/src/military/qz2022/apply/index.jsx
+++ b/src/military/qz2022/apply/index.jsx
@@ -214,7 +214,7 @@ export default Form.create()((props) => {
         <Button type="primary" className="submit_info" onClick={applySubmit}>
           提交资料
         </Button>
-        <a href={httpUrl+'/busiAttachments/download/391'}><Button className="add_member download ml20">
+        <a href={'http://osrem.jk:81/api/attachments/1963'}><Button className="add_member download ml20">
           下载报名表
         </Button></a>
       </div>}
diff --git a/src/military/qz2022/chat/index.jsx b/src/military/qz2022/chat/index.jsx
index a31f9638..a6921d4e 100644
--- a/src/military/qz2022/chat/index.jsx
+++ b/src/military/qz2022/chat/index.jsx
@@ -34,15 +34,15 @@ function Chat({ form, showNotification, match, history }) {
       {/*  style={{display:'flex', width: '1200px', margin:'30px auto',padding: '0 120px',justifyContent: 'space-between', background: 'white'}} */}
       {/*  style={{display:'flex',alignItems: 'center'}} */}
       <div className="links qz_main">
-        <div onClick={() => { window.open('https://fc.osredm.com/forums/theme/107') }}>
+        <div onClick={() => { window.open('http://www.osredm.jk/forums/theme/76') }}>
           <img src={chat1}></img>
           <div>参赛咨询</div>
         </div>
-        <div onClick={() => { window.open('https://fc.osredm.com/forums/theme/108') }}>
+        <div onClick={() => { window.open('http://www.osredm.jk/forums/theme/77') }}>
           <img src={chat2}></img>
           <div>选手交流</div>
         </div>
-        <div onClick={() => { window.open('https://fc.osredm.com/forums/theme/109') }}>
+        <div onClick={() => { window.open('http://www.osredm.jk/forums/theme/78') }}>
           <img src={chat3}></img>
           <div>专家答疑</div>
         </div>