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 (
-
+
+
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 { { mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ? - 可控开源社区 +
+ 可控开源社区 + { + activeIndex&&
+

红山开源

+

OSRedM

+
+ } +
: "" } 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; +}