diff --git a/src/forge/Information/Component/projects.jsx b/src/forge/Information/Component/projects.jsx index 134023331..2cf9ad733 100644 --- a/src/forge/Information/Component/projects.jsx +++ b/src/forge/Information/Component/projects.jsx @@ -20,7 +20,7 @@ function SamplePrevArrow(props) { const settings = { className: "center", centerMode: true, - infinite: true, + infinite: false, centerPadding: "100px", slidesToShow: 3, speed: 500, @@ -41,7 +41,7 @@ function Projects(props) { return( -
+
{ projectList && projectList.length > 0 ? diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx index 647254ba0..50ee32583 100644 --- a/src/forge/Information/Component/publicBanner.jsx +++ b/src/forge/Information/Component/publicBanner.jsx @@ -1,6 +1,5 @@ import React , { useState , useEffect } from 'react'; import { Menu } from 'antd'; -import Menu7 from '../img/menu7.png'; import banner from '../img/mainbanner.png' import { Link } from 'react-router-dom'; import { tempConfig } from '../tempInfo'; @@ -53,7 +52,7 @@ function PublicBanner(props){ { tempConfig[temp].mainTitle } {/* Sig小组 */} { tempConfig[temp].member } - { adminUrl && {window.location.href=adminUrl}}>后台管理 } + { adminUrl && {window.location.href=adminUrl}}>后台管理 }
diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx index e81620c8e..37eb36099 100644 --- a/src/forge/Information/Pages/headerPage.jsx +++ b/src/forge/Information/Pages/headerPage.jsx @@ -123,11 +123,10 @@ function HeaderPage(props){ } { // 精选项目 - data && data.projectShow === 1 && + data && data.projectShow === 1 && projectList && projectList.length>0 &&

{ data.homepageProjectTitle }

{ - projectList && projectList.length>0&&
{ projectList.map((i,k)=>{ @@ -148,11 +147,10 @@ function HeaderPage(props){ } { // 核心贡献者 - data && data.memberShow === 1 && + data && data.memberShow === 1 && personList && personList.length > 0 &&

{ data.homepageMemberTitle }

{ - personList && personList.length > 0 &&
    { personList.map((i,k)=>{ diff --git a/src/forge/Information/Pages/headerPageZone1.jsx b/src/forge/Information/Pages/headerPageZone1.jsx index bd7b761fc..0ef71a67b 100644 --- a/src/forge/Information/Pages/headerPageZone1.jsx +++ b/src/forge/Information/Pages/headerPageZone1.jsx @@ -13,6 +13,7 @@ import intro3 from '../img/intro3.png'; import intro4 from '../img/intro4.png'; import guideArrow from '../img/guideArrow1.png'; import ra from '../img/ra.png' +import title from '../img/title.png' import { Link } from 'react-router-dom'; import shijian from '../img/shijian.png'; import axios from 'axios'; @@ -225,7 +226,8 @@ function HeaderPage(props){
-

开源芯⽚⽤户成长体系介绍

+ {/*

开源芯⽚⽤户成长体系介绍

*/} +

参与开源芯⽚项⽬的开发者需要签署开源贡献者协议

建议开发者按照开源项⽬成长路径进⾏参与,稳步提升能⼒,降低跳级参与带来的挑战

diff --git a/src/forge/Information/Pages/projectSource.jsx b/src/forge/Information/Pages/projectSource.jsx index c2575644e..83c3cc30b 100644 --- a/src/forge/Information/Pages/projectSource.jsx +++ b/src/forge/Information/Pages/projectSource.jsx @@ -153,8 +153,8 @@ function ProjectSource(props){ }
    {/* { i.deptName &&
  • {i.deptName}
  • } */} - { i.projectProperties && i.projectProperties.language &&
  • {i.projectProperties.language}
  • } - { i.projectType &&
  • {i.projectType}
  • } + { i.projectType &&
  • {i.projectType}
  • } + { i.projectProperties && i.projectProperties.language &&
  • {i.projectProperties.language}
  • } { i.projectProperties && i.projectProperties.timeAgo &&
  • 更新于{i.projectProperties.timeAgo}
  • }
diff --git a/src/forge/Information/img/title.png b/src/forge/Information/img/title.png new file mode 100644 index 000000000..ceda46d25 Binary files /dev/null and b/src/forge/Information/img/title.png differ diff --git a/src/forge/Information/img/zone1Menu7.png b/src/forge/Information/img/zone1Menu7.png new file mode 100644 index 000000000..7214b3c68 Binary files /dev/null and b/src/forge/Information/img/zone1Menu7.png differ diff --git a/src/forge/Information/img/menu7.png b/src/forge/Information/img/zoneMenu7.png similarity index 100% rename from src/forge/Information/img/menu7.png rename to src/forge/Information/img/zoneMenu7.png diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 29e466c80..056bc1f78 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -84,8 +84,8 @@ function Index(props){ function getAdminUrl(id){ getCheckZoneRole(id).then(response=>{ - if(response && response.data && response.data.data){ - setAdminUrl(response.data.data); + if(response){ + setAdminUrl(response.data); }else{ setAdminUrl(undefined); } diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 0212cd430..43240249e 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -574,6 +574,8 @@ background-color:var(--primary-color); border-radius: 50%; } + } + .show_after { &::after{ content: ""; right: 0px; diff --git a/src/forge/Information/indexZone1.scss b/src/forge/Information/indexZone1.scss index 544c899dc..e2bc2d5ff 100644 --- a/src/forge/Information/indexZone1.scss +++ b/src/forge/Information/indexZone1.scss @@ -219,10 +219,13 @@ height: 435px; .slick-slide { height: auto; - opacity: 0; } - .slick-active { - opacity: 1; + } + .not_three_project { + .slick-track { + .slick-slide[aria-hidden="true"] { + opacity: 0; + } } } .slick-current { @@ -385,6 +388,11 @@ align-items: center; background: url('./img/growBg.png') no-repeat; background-size: 100% 100%; + .in_title { + img { + width: 378px; + } + } .grow_path { height: 158px; display: flex;