diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx
index d94b5665b..952d9bf61 100644
--- a/src/forge/Information/Component/publicBanner.jsx
+++ b/src/forge/Information/Component/publicBanner.jsx
@@ -5,6 +5,7 @@ import Menu2 from '../img/menu2.png';
import Menu3 from '../img/menu3.png';
import Menu4 from '../img/menu4.png';
import Menu5 from '../img/menu5.png';
+import Menu6 from '../img/menu6.png';
import { Link } from 'react-router-dom';
@@ -18,16 +19,21 @@ function PublicBanner(props){
if(pathname){
const head = /\/information\/[0-9]{0,}/g;
const info = /\/information\/[0-9]{0,}\/news/g;
+ const infodetail = /\/information\/[0-9]{0,}\/newdetail/g;
const project = /\/information\/[0-9]{0,}\/projects/g;
+ const vip = /\/information\/[0-9]{0,}\/VIP/g;
if(head.test(pathname)){
setKey("1");
}
if(project.test(pathname)){
setKey("2");
}
- if(info.test(pathname)){
+ if(info.test(pathname) || infodetail.test(pathname)){
setKey("4");
}
+ if(vip.test(pathname)){
+ setKey("6");
+ }
}
},[pathname])
@@ -47,6 +53,7 @@ function PublicBanner(props){
资源发布
领域资讯
Sig小组
+
专区会员
diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx
index 72de047ec..7cfcb38c8 100644
--- a/src/forge/Information/Pages/headerPage.jsx
+++ b/src/forge/Information/Pages/headerPage.jsx
@@ -8,6 +8,7 @@ import axios from 'axios';
function HeaderPage(props){
const [ projectList , setProjectList ] = useState(undefined);
+ const [ personList , setPersonList ] = useState(undefined);
const [ newsList, setNewsList ] = useState(undefined);
const { deptId } = props.match.params;
const { data } = props;
@@ -15,8 +16,18 @@ function HeaderPage(props){
useEffect(()=>{
getProjectList();
getNewsList();
+ getPersonList();
},[])
+ function getPersonList(){
+ const url = `/zone/open/${deptId}/member/homePageList`;
+ axios.get(url).then(result=>{
+ if(result){
+ setPersonList(result.data.rows);
+ }
+ }).catch(error=>{})
+ }
+
function getNewsList(){
const url = `/cms/doc/open/zone/${deptId}/homePageDocList`;
axios.get(url).then(result=>{
@@ -29,7 +40,7 @@ function HeaderPage(props){
function getProjectList(){
const url = `/zone/open/${deptId}/project/list`;
axios.get(url,{params:{
- isHomepage:1,pageNum:1,pageSize:4
+ isHomepage:1
}}).then(result=>{
if(result){
setProjectList(result.data.rows);
@@ -102,7 +113,7 @@ function HeaderPage(props){
{i.projectProperties && i.projectProperties.authorImageUrl &&
}
@@ -114,28 +125,22 @@ function HeaderPage(props){
核心贡献者
-
- -
-
- 贡献者名字一
- 我是贡献者的简介内容占两行我是贡献者的简介内容占两行我是贡献者的简介内容占两行
-
- -
-
- 贡献者名字一2
- 我是贡献者的简介内容占两行我是贡献者的简介内容占两行我是贡献者的简介内容占两行
-
- -
-
- 贡献者名字一3
- 我是贡献者的简介内容占两行我是贡献者的简介内容占两行我是贡献者的简介内容占两行
-
- -
-
- 贡献者名字一4
- 我是贡献者的简介内容占两行我是贡献者的简介内容占两行我是贡献者的简介内容占两行
-
-
+ {
+ personList && personList.length > 0 &&
+
+ {
+ personList.map((i,k)=>{
+ return(
+ -
+
+ {i.name}
+ {i.introduction}
+
+ )
+ })
+ }
+
+ }
diff --git a/src/forge/Information/Pages/newsList.jsx b/src/forge/Information/Pages/newsList.jsx
index c187cdaec..665132758 100644
--- a/src/forge/Information/Pages/newsList.jsx
+++ b/src/forge/Information/Pages/newsList.jsx
@@ -1,7 +1,7 @@
import React , { useEffect , useState } from 'react';
import PublicBanner from '../Component/publicBanner';
import { Box , LongWidth } from '../../Component/layout';
-import { Menu , Breadcrumb , Pagination } from 'antd';
+import { Menu , Breadcrumb , Pagination , Spin } from 'antd';
import Hot from '../Component/hot';
import axios from 'axios';
import shijian from '../img/shijian.png';
@@ -19,6 +19,7 @@ function NewsList(props){
const [ hostList , setHotList ] = useState(undefined);
const [ mainList , setMainList ] = useState(undefined);
const [ details , setDetails ] = useState(undefined);
+ const [ menuSpin , setMenuSpin ] = useState(true);
useEffect(()=>{
if(deptId && cateId){
@@ -28,6 +29,7 @@ function NewsList(props){
useEffect(()=>{
if(deptId && cateId){
+ setMenuSpin(true);
getMainList();
getHotList();
getColumnList();
@@ -50,6 +52,7 @@ function NewsList(props){
if(result){
setColumnList(result.data.rows);
setTotal(result.data.total);
+ setMenuSpin(false);
}
}).catch(error=>{})
}
@@ -90,20 +93,22 @@ function NewsList(props){
{details && details.name}
- {
- columnList && columnList.length>0 &&
+
-
+ {
+ columnList && columnList.length>0 &&
+
+ }
- }
+
diff --git a/src/forge/Information/Pages/projectSource.jsx b/src/forge/Information/Pages/projectSource.jsx
index 6053df952..97bf2a301 100644
--- a/src/forge/Information/Pages/projectSource.jsx
+++ b/src/forge/Information/Pages/projectSource.jsx
@@ -112,7 +112,7 @@ function ProjectSource(props){
{i.projectProperties &&

}