diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 20fec8ce..0fe1cb31 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -288,14 +288,14 @@ class NewHeader extends Component { {...this.props} {...this.state} /> : ""} -
+ {/*
{ publicNav && ccf } -
+
*/} { settings && settings.nav_logo_url ? diff --git a/src/home/Img/com-1.png b/src/home/Img/com-1.png new file mode 100644 index 00000000..53dad32a Binary files /dev/null and b/src/home/Img/com-1.png differ diff --git a/src/home/Img/com-2.png b/src/home/Img/com-2.png new file mode 100644 index 00000000..bef3734f Binary files /dev/null and b/src/home/Img/com-2.png differ diff --git a/src/home/Img/com-3.png b/src/home/Img/com-3.png new file mode 100644 index 00000000..e9696874 Binary files /dev/null and b/src/home/Img/com-3.png differ diff --git a/src/home/Img/com-back.png b/src/home/Img/com-back.png new file mode 100644 index 00000000..33775c20 Binary files /dev/null and b/src/home/Img/com-back.png differ diff --git a/src/home/Img/xing-banner1.png b/src/home/Img/xing-banner1.png new file mode 100644 index 00000000..54ace0e2 Binary files /dev/null and b/src/home/Img/xing-banner1.png differ diff --git a/src/home/Img/xing-threeEdition.png b/src/home/Img/xing-threeEdition.png new file mode 100644 index 00000000..cef26141 Binary files /dev/null and b/src/home/Img/xing-threeEdition.png differ diff --git a/src/home/Index.jsx b/src/home/Index.jsx index 453acd74..2bbb72bd 100644 --- a/src/home/Index.jsx +++ b/src/home/Index.jsx @@ -1,7 +1,8 @@ import React , { useEffect , useState } from 'react'; import "./Index.scss"; import TopEdition from './TopEdition'; -import ThirdEdition from './ThirdEdition'; +// import ThirdEdition from './ThirdEdition'; +import ThirdeditionXing from './ThirdEditionXing'; import { Anchor } from 'antd'; import F41 from './Img/4-1.png'; import F42 from './Img/4-2.png'; @@ -10,7 +11,6 @@ import F44 from './Img/4-4.png'; import SecondEdition from './SecondEdition'; import FifthEdition from './FifthEdition'; import { TPMIndexHOC } from '../modules/tpm/TPMIndexHOC'; -import Axios from 'axios'; function Index(props) { const [ value , setValue ] = useState(""); @@ -23,7 +23,7 @@ function Index(props) { useEffect(()=>{ window.addEventListener("scroll",scrollListener); - getTab(); + // getTab(); return ComponentWillUnmount; },[]) @@ -35,18 +35,18 @@ function Index(props) { window.removeEventListener("scroll",scrollListener); } - function getTab() { - const url = `/topics.json?topic_type=card`; - Axios.get(url,{ - params:{ - limit:3 - } - }).then(result=>{ - if(result){ - setBannerTab(result.data.topics); - } - }).catch(error=>{}) - } + // function getTab() { + // const url = `/topics.json?topic_type=card`; + // Axios.get(url,{ + // params:{ + // limit:3 + // } + // }).then(result=>{ + // if(result){ + // setBannerTab(result.data.topics); + // } + // }).catch(error=>{}) + // } function scrollListener(event) { @@ -93,29 +93,13 @@ function Index(props) { } : - + "" }
-

GitLink，新一代开源创新服务平台

+

星云协同开发平台

{ flag && @@ -129,11 +113,12 @@ function Index(props) {
- + {/* */} +
-

加入GitLink，和社区伙伴们一起踏上开源创新的辉煌旅程！

+

加入星云协同开发平台，和社区伙伴们一起踏上开源创新的辉煌旅程！

{ !(current_user && current_user.login) && 立即注册 }
@@ -161,11 +146,11 @@ function Index(props) {
-
+ {/*

开源生态

GitLink与各大企业、高校、科研机构开展广泛的技术合作，推动我国开源软件生态的快速构建与发展

-
+
*/} ) } diff --git a/src/home/Index.scss b/src/home/Index.scss index 2a708cd5..1de01283 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -9,7 +9,7 @@ body{ .topEdition{ position: relative; background-image: linear-gradient(to right,#081843,#000A1D); - margin-bottom: 159px; + margin-bottom: 70px; .headNav{ position: absolute; width: 100%; @@ -54,7 +54,7 @@ body{ } } .slick-track{ - height: 679px; + height: 560px; display: flex; .slick-slide{ position: relative; @@ -1110,4 +1110,72 @@ body{ a{ color: #BDC2D1!important; } +} +.xingEdition{ + background-image: url('./Img/xing-threeEdition.png'); + background-size: 100% 100%; + position: relative; + padding-top: 56px; + .theTitle{ + font-size: 34px; + font-weight: 500; + margin:0px auto; + text-align: center; + position: absolute; + width: 100%; + top:79px; + } + .xingBanner{ + width: 965px; + height: 708px; + background-image: url('./Img/com-back.png'); + background-size: 100% 100%; + margin:0px auto; + display: flex; + align-items: center; + justify-content: center; + position: relative; + .slick-dots{ + position: absolute; + bottom: 70px; + display: flex!important; + align-items: center; + width: 100%; + justify-content: center; + li{ + width: 6px; + height: 6px; + border-radius: 50%; + margin:0px 3px; + background-color: #eee; + button{ + display: none; + } + &.slick-active{ + background-color: #466AFF; + } + } + } + .slick-list{ + display: flex; + align-items: center; + height: 380px; + width: 616px; + overflow: hidden; + margin-top: -35px; + border-radius: 10px 10px 0px 0px; + .slick-track{ + display: flex; + .regform{ + position: relative; + height: 100%; + text-align: center; + img{ + height: 380px; + width: 626px; + } + } + } + } + } } \ No newline at end of file diff --git a/src/home/ThirdEditionXing.jsx b/src/home/ThirdEditionXing.jsx new file mode 100644 index 00000000..e2bd3baa --- /dev/null +++ b/src/home/ThirdEditionXing.jsx @@ -0,0 +1,37 @@ +import React from 'react'; +import './Index.scss'; +import Slider from 'react-slick'; +import Back from './Img/xing-threeEdition.png'; +import com1 from './Img/com-1.png'; +import com2 from './Img/com-2.png'; +import com3 from './Img/com-3.png'; + + +let setting={ + dots:true, + infinite: true, + speed: 2000, + slidesToShow: 1, + slidesToScroll: 1, + pauseOnDotsHover:true, + autoplaySpeed:3000, + pauseOnFocus:true, + autoplay:true, + arrows:false, + // prevArrow:, + // nextArrow: +} + +function ThirdEditionXing() { + return( +
+

星云操作系统简介

+ +
+
+
+ +
+ ) +} +export default ThirdEditionXing; \ No newline at end of file diff --git a/src/home/TopEdition.jsx b/src/home/TopEdition.jsx index 37c48efa..be243dd5 100644 --- a/src/home/TopEdition.jsx +++ b/src/home/TopEdition.jsx @@ -4,6 +4,7 @@ import axios from 'axios'; import { getImageUrl } from 'educoder'; import Left from './Img/left.png'; import Right from './Img/right.png'; +import xingBanner1 from './Img/xing-banner1.png'; let setting={ @@ -25,7 +26,16 @@ function TopEdition({register,current_user}) { const [ bannerList , setBannerList ] = useState(undefined); useEffect(()=>{ - getBanner(); + // getBanner(); + let list = [ + { + id: 1, + image: xingBanner1, + title: "星云协同开发", + url: "" + } + ] + setBannerList(list); },[]) function getBanner() { @@ -49,12 +59,12 @@ function TopEdition({register,current_user}) {
{/* style={{backgroundImage:`url(${getImageUrl(i.image)})`}} */}
{if(i.url){window.location.href=i.url}}} style={{cursor: i.url ? 'pointer' : ''}}> - - { + + {/* { k +1 === bannerList.length && (!(current_user && current_user.login)) ?

立即注册

:"" - } + } */}
) diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index da44feeb..8704e03d 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -36,6 +36,10 @@ body>.-task-title { position: absolute; background: rgba(27, 36, 64,0.2); } +.newHeaders.publicNav .headerContent{ + width: 1200px; + padding:0px; +} .headerContent{ margin:0px auto; padding:0px 30px;