From c6bc26c5aebef8607634a0b04289917ad2a1c162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Wed, 10 Nov 2021 16:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E5=8F=8A=E7=AC=AC=E4=B8=80=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                     |  4 ++--
 src/home/index.jsx                   |  3 ++-
 src/home/index.scss                  | 28 +++++++++++++++++++++++-----
 src/modules/tpm/NewHeader.js         | 10 +++++++++-
 src/modules/tpm/css/headerExcess.css | 23 +++++++++++++++++++++++
 5 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index 1b78e7a91..55873f00d 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -56,8 +56,8 @@ export function initAxiosInterceptors(props) {
   // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
   var
     proxy = "http://localhost:3000";
-    proxy = "https://forge.osredm.com";
-    // proxy = "http://117.50.100.12:49999";
+    // proxy = "https://forge.osredm.com";
+    proxy = "http://117.50.100.12:49999";
 
   const requestMap = {};
   window.setfalseInRequestMap = function (keyName) {
diff --git a/src/home/index.jsx b/src/home/index.jsx
index b72d28232..bdef10f41 100644
--- a/src/home/index.jsx
+++ b/src/home/index.jsx
@@ -8,7 +8,8 @@ function HomePage(props) {
 
   return (
     <div className="homePage">
-      <div className="topEdition">
+      <div className="first-edition">
+
       </div>
 
       <div className="waves-header">
diff --git a/src/home/index.scss b/src/home/index.scss
index 9dc066545..95015ae68 100644
--- a/src/home/index.scss
+++ b/src/home/index.scss
@@ -1,3 +1,19 @@
+.homePage{
+  margin-top:-6px;
+
+  .first-edition{
+    height: 80vh;
+    background: linear-gradient(
+      // top,
+    #1A2358 0%,
+    #12277B 33%,
+    #0C2D8F 67%,
+    #002A89 100%
+  );
+  }
+}
+
+
 .hero-waves {
   display: block;
   width: 100%;
@@ -6,6 +22,7 @@
 }
 
 
+
 .news-slide {
   margin: 20px auto;
   width: 600px;
@@ -49,11 +66,12 @@
 .waves-header {
   position: relative;
   text-align: center;
-  background: linear-gradient(
-    60deg,
-    rgba(84, 58, 183, 1) 0%,
-    rgba(0, 172, 193, 1) 100%
-  );
+  background: #002A89;
+  // background: linear-gradient(
+  //   60deg,
+  //   rgba(84, 58, 183, 1) 0%,
+  //   rgba(0, 172, 193, 1) 100%
+  // );
   color: white;
 }
 .waves {
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index eefad5eec..bac9f5063 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -724,7 +724,15 @@ class NewHeader extends Component {
           <a href={mygetHelmetapi2 && mygetHelmetapi2.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
             {
               mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ?
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getLogoImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
+              <div className="logoDiv">
+                <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getLogoImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
+                {
+                  activeIndex&&<div className="logo-text">
+                    <p>红山开源</p>
+                    <p className="logo-English">OSRedM</p>
+                  </div>
+                }
+              </div>
               :
               ""
             }
diff --git a/src/modules/tpm/css/headerExcess.css b/src/modules/tpm/css/headerExcess.css
index d0104c368..afe7cc066 100644
--- a/src/modules/tpm/css/headerExcess.css
+++ b/src/modules/tpm/css/headerExcess.css
@@ -13,8 +13,31 @@
 
 .newHeaders.homePage{
   background-color: #1A2358;
+  /* height: 64px; */
 }
 .newHeaders.homePage .head-nav ul#header-nav li a{
+  font-size: 15px;
+  color: #fff;
+}
+.logoDiv{
+  display: flex;
+  align-items: center;
   color: #fff;
 }
 
+.homePage .logoDiv img{
+  min-width: 45px;
+  height: 45px;
+}
+
+.logo-text{
+  margin-left: .2em;
+  text-align: center;
+}
+.logo-text p{
+  line-height: 1.1;
+}
+
+.logo-English{
+  font-size: .8em;
+}