From ec2f78a2581d3fac887074a559ed29b9f73ae536 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 29 May 2023 10:55:34 +0800 Subject: [PATCH] save --- .../Information/Component/publicBanner.jsx | 9 ++- src/forge/Information/Pages/headerPage.jsx | 53 ++++++++++-------- src/forge/Information/Pages/newsList.jsx | 31 +++++----- src/forge/Information/Pages/projectSource.jsx | 2 +- src/forge/Information/Pages/zoneVIP.jsx | 14 +++++ src/forge/Information/img/menu6.png | Bin 0 -> 4824 bytes src/forge/Information/index.jsx | 10 ++++ src/forge/Information/index.scss | 21 ++++++- 8 files changed, 98 insertions(+), 42 deletions(-) create mode 100644 src/forge/Information/Pages/zoneVIP.jsx create mode 100644 src/forge/Information/img/menu6.png 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 && }
    - {i.fullName} + window.open(i.projectURL)} className="z_p_title">{i.fullName}

    {i.projectProperties && i.projectProperties.description ? i.projectProperties.description : "暂无~"}

    • @@ -114,28 +125,22 @@ function HeaderPage(props){

    核心贡献者

    - + { + personList && personList.length > 0 && + + }
    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.map((i,k)=>{ - return( - {i.name} - ) - }) - } - + { + columnList && columnList.length>0 && + + { + columnList.map((i,k)=>{ + return( + {i.name} + ) + }) + } + + }
    - } +
    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 && }

    - {i.fullName} + window.open(i.projectURL)}>{i.fullName} { i.projectProperties &&

      diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx new file mode 100644 index 000000000..d5edbedfd --- /dev/null +++ b/src/forge/Information/Pages/zoneVIP.jsx @@ -0,0 +1,14 @@ +import React from 'react'; + + +function ZoneVIP(props){ + const { deptId } = props.match.params; + + return( +
      +

      专区会员

      +

      社区根据您的贡献与扮演角色将用户划分成为不同的人员团队，并构建会员成长体系。您有兴趣成为会员，尽情发挥创意与智慧，与专区共同成长吗？

      +
      + ) +} +export default ZoneVIP; \ No newline at end of file diff --git a/src/forge/Information/img/menu6.png b/src/forge/Information/img/menu6.png new file mode 100644 index 0000000000000000000000000000000000000000..b9834a3e1a3ce15c2755a1c018d60e6f28bb17ca GIT binary patch literal 4824 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 import("./Pages/zoneVIP"), + loading: Loading, +}); const HeaderPage = Loadable({ loader: () => import("./Pages/headerPage"), loading: Loading, @@ -87,6 +91,12 @@ function Index(props){ )} > + ( + + )} + > ( diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 36b2222d7..4fc305386 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -1,5 +1,6 @@ .information_main{ background-color:#f3f5f8; + min-height: 100vh; .ant-breadcrumb{ font-size: 15px; margin-bottom: 20px; @@ -673,15 +674,17 @@ } .zone_contributor{ min-height: 466px; - background-image: url(./img/productBg2.png); - background-size: 100% 100%; + // background-image: url(./img/productBg2.png); + // background-size: 100% 100%; + background-color: #F7F9FC; width: 100%; - padding:44px 0px 58px; + padding:44px 0px 30px; .zone_c_lists{ display: flex; align-items: center; margin-top: 50px; justify-content: space-between; + flex-wrap: wrap; li{ padding:17px 13px; background-image: url(./img/contributebg.png); @@ -691,6 +694,7 @@ display: flex; flex-direction: column; align-items: center; + margin-bottom: 30px!important; &>img{ width: 80px; height: 80px; @@ -747,4 +751,15 @@ } } } +} +.zone_VIP_box{ + padding:50px 0px; + .vip_sub_title{ + color:#1f2329; + font-size:15px; + line-height:27px; + text-align:center; + margin-top: 16px; + max-width: 1000px; + } } \ No newline at end of file