diff --git a/src/forge/Main/projectHomeNew/v2/index.jsx b/src/forge/Main/projectHomeNew/v2/index.jsx index 4abd6c3b..4aa18b8a 100644 --- a/src/forge/Main/projectHomeNew/v2/index.jsx +++ b/src/forge/Main/projectHomeNew/v2/index.jsx @@ -155,7 +155,7 @@ function ProjectHomePage(props) {
JY开源软件仓库
-
汇聚全球顶尖开源力量,构建安全、协同、创新的软件生态,赋能军事数字化转型与智能化升级
+
汇聚全球顶尖开源力量,构建安全、协同、创新的软件生态,赋能J事数字化转型与智能化升级
diff --git a/src/forge/Main/projecthome/components/Banner.jsx b/src/forge/Main/projecthome/components/Banner.jsx index b6edd86b..471c8154 100644 --- a/src/forge/Main/projecthome/components/Banner.jsx +++ b/src/forge/Main/projecthome/components/Banner.jsx @@ -6,7 +6,7 @@ import banner3 from '../../img/home/banner3.webp'; import { Link } from "react-router-dom"; const BANNER_DATA = [ - { key: 1, keyword: '仓库', name: 'JY开源软件仓库', title: 'JY开源软件仓库', content: '提供软件源码的集中托管与协作、编译构建后的制品统一管理,并支持一键搜索与下载成熟可用的应用程序,为军事软件的全生命周期提供一站式管理与分发服务', img: banner1 }, + { key: 1, keyword: '仓库', name: 'JY开源软件仓库', title: 'JY开源软件仓库', content: '提供软件源码的集中托管与协作、编译构建后的制品统一管理,并支持一键搜索与下载成熟可用的应用程序,为J事软件的全生命周期提供一站式管理与分发服务', img: banner1 }, { key: 2, keyword: '供应链', name: '供应链监测', title: '供应链监测', content: '实现供应链全流程可视化与智能决策。通过实时数据监控、需求预测与风险预警,优化库存与资源配置,助力精准掌控供应链动态,实现降本增效', img: banner2 }, // { key: 3, keyword: '软件工厂', name: '软件工厂专区', title: '软件工厂专区', content: '为您提供从需求到部署的一站式项目工程化管理。通过标准化流程、自动化流水线与统一制品库,赋能团队高效协作、规范交付,全面提升软件生产质量与效率', img: banner3 } ] diff --git a/src/forge/Main/projecthome/v2/animation.scss b/src/forge/Main/projecthome/v2/animation.scss new file mode 100644 index 00000000..eb4b08d8 --- /dev/null +++ b/src/forge/Main/projecthome/v2/animation.scss @@ -0,0 +1,49 @@ +.title_v2{ + opacity: 0; + transform: translateY(50px); +} +.news_v2, .activities-container, .open-source-collaboration-container-content, .software-factory-content, .ecosystem-alliance-content, .forum-exchange-content, .governance-grid, .repository-v2-content{ + opacity: 0; + transform: translateY(50px); +} +.forum-exchange{ + opacity: 0; + transform: scale(0.9); + &.home_v2_visible .title_v2{ + animation-delay: 0.3s; + } + &.home_v2_visible .forum-exchange-content{ + animation-delay: 0.5s; + } +} +.home_v2_visible{ + .title_v2{ + animation: fadeInUp 0.8s ease-out forwards; + } + .news_v2, .activities-container, .open-source-collaboration-container-content, .software-factory-content, .ecosystem-alliance-content, .forum-exchange-content, .governance-grid, .repository-v2-content{ + animation: fadeInUp 0.8s ease-out forwards; + animation-delay: 0.3s; + } + &.forum-exchange{ + animation: resourceShow 0.8s ease-in-out forwards; + } +} + +@keyframes fadeInUp { + from { + opacity: 0; + transform: translateY(50px); + } + + to { + opacity: 1; + transform: translateY(0); + } +} + +@keyframes resourceShow { + to { + opacity: 1; + transform: scale(1); + } +} \ No newline at end of file diff --git a/src/forge/Main/projecthome/v2/components/banner.jsx b/src/forge/Main/projecthome/v2/components/banner.jsx index d3f0d1c2..6fc2bfe9 100644 --- a/src/forge/Main/projecthome/v2/components/banner.jsx +++ b/src/forge/Main/projecthome/v2/components/banner.jsx @@ -39,14 +39,14 @@ function Banner({isVisible}) { {/* 主要内容区域 */}
- XX可控开源社区· + J队可控开源社区·
探索群智众创新范式
-
构建军方协同新生态
+
构建J民协同新生态
{/* 克隆元素用于循环 */}
探索群智众创新范式
-
构建军方协同新生态
+
构建J民协同新生态
@@ -91,19 +91,14 @@ function Banner({isVisible}) {
开源项目
-
-
100
-
合作伙伴
-
-
1000
-
应用软件
+
开发工具
99
-
漏洞数量
+
已治理组件
@@ -113,7 +108,12 @@ function Banner({isVisible}) {
21
-
论坛数量
+
论坛交流
+
+ +
+
50
+
生态伙伴
diff --git a/src/forge/Main/projecthome/v2/components/ecosystemAlliance.jsx b/src/forge/Main/projecthome/v2/components/ecosystemAlliance.jsx index 65bc04d5..cc170a2a 100644 --- a/src/forge/Main/projecthome/v2/components/ecosystemAlliance.jsx +++ b/src/forge/Main/projecthome/v2/components/ecosystemAlliance.jsx @@ -23,37 +23,56 @@ const EcosystemAlliance = () => { // const secondRowPartners = partners.slice(Math.ceil(partners.length / 2)); const partners1 = [ - {title: "合作高校", children: [ - { name: '国防科技大学', logo: require('../image/logo1.png') }, - { name: '海军工程大学', logo: require('../image/logo5.png').default }, - { name: '南京信息工程大学', logo: require('../image/logo4.png').default }, - { name: '陆军工程大学', logo: require('../image/logo6.png').default }, - { name: '航天工程大学', logo: require('../image/logo3.png').default }, - { name: '信息工程大学', logo: require('../image/logo14.png').default }, - ]}, - {title: "合作企业", children: [ - { name: '中电太极', logo: require('../image/logo7.png').default }, - { name: '中国电科第十五研究所', logo: require('../image/logo8.png').default }, - { name: '华为', logo: require('../image/logo2.png') }, - { name: '阿里云', logo: require('../image/logo11.png') }, - { name: '飞腾', logo: require('../image/logo10.png') }, - { name: '航天706所', logo: require('../image/logo15.png') }, - { name: '麒麟', logo: require('../image/logo9.png') }, - { name: '中国电子云', logo: require('../image/logo12.png') }, - { name: '中国移动云', logo: require('../image/logo13.png').default } - ]}, - {title: "合作社区", children: [ - { name: 'GitLink', logo: require('../image/logo16.png') }, - { name: '红山开源', logo: require('../image/logo17.png') }, - { name: '麒麟社区', logo: require('../image/logo18.png') }, - { name: '鸿蒙社区', logo: require('../image/logo19.png') }, - { name: '鸥栖社区', logo: require('../image/logo20.png') }, - { name: '木兰开源社区', logo: require('../image/logo21.png').default }, - { name: '魔搭社区', logo: require('../image/logo22.png') }, - { name: '魔乐社区', logo: require('../image/logo25.png') }, - { name: '启智社区', logo: require('../image/logo23.png') }, - { name: '欧拉社区', logo: require('../image/logo24.png') }, - ]} + { + title: "研究机构", children: [ + { name: '国防科技大学', logo: require('../image/logo1.png') }, + { name: '海军工程大学', logo: require('../image/logo5.png').default }, + { name: '南京信息工程大学', logo: require('../image/logo4.png').default }, + { name: '陆军工程大学', logo: require('../image/logo6.png').default }, + { name: '航天工程大学', logo: require('../image/logo3.png').default }, + { name: '信息工程大学', logo: require('../image/logo14.png').default }, + { name: '清华大学', logo: require('../image/logo26.png').default }, + { name: '北京大学', logo: require('../image/logo27.png').default }, + { name: '中国科学院软件研究所', logo: require('../image/logo28.png').default }, + { name: '北京航空航天大学', logo: require('../image/logo29.png').default }, + { name: '上海交通大学', logo: require('../image/logo30.png').default }, + { name: '复旦大学', logo: require('../image/logo31.png') }, + { name: '湖南先进技术研究院', logo: require('../image/logo32.png').default }, + // 清华、北大、中科院软件所、北京航空航天大学、上海交大、复旦、湖南先进院 + ] + }, + { + title: "合作企业", children: [ + { name: '中电太极', logo: require('../image/logo7.png').default }, + { name: '中国电科第十五研究所', logo: require('../image/logo8.png').default }, + { name: '华为', logo: require('../image/logo2.png') }, + { name: '阿里云', logo: require('../image/logo11.png') }, + { name: '飞腾', logo: require('../image/logo10.png') }, + { name: '航天706所', logo: require('../image/logo15.png') }, + { name: '麒麟', logo: require('../image/logo9.png') }, + { name: '中国电子云', logo: require('../image/logo12.png') }, + { name: '中国移动云', logo: require('../image/logo13.png').default }, + { name: '联通', logo: require('../image/logo36.png').default }, + { name: '中船重工', logo: require('../image/logo33.png').default }, + { name: '航天五院', logo: require('../image/logo34.png').default }, + { name: '航天软件集团', logo: require('../image/logo35.png').default } + // 联通、中船重工、航天五院、航天软件集团 + ] + }, + { + title: "合作社区", children: [ + { name: 'GitLink', logo: require('../image/logo16.png') }, + { name: '红山开源', logo: require('../image/logo17.png') }, + { name: '麒麟社区', logo: require('../image/logo18.png') }, + { name: '鸿蒙社区', logo: require('../image/logo19.png') }, + { name: '鸥栖社区', logo: require('../image/logo20.png') }, + { name: '木兰开源社区', logo: require('../image/logo21.png').default }, + { name: '魔搭社区', logo: require('../image/logo22.png') }, + { name: '魔乐社区', logo: require('../image/logo25.png') }, + { name: '启智社区', logo: require('../image/logo23.png') }, + { name: '欧拉社区', logo: require('../image/logo24.png') }, + ] + } ] // 标签切换处理 @@ -63,9 +82,11 @@ const EcosystemAlliance = () => { return (
-
生态联盟
+
生态联盟 · 合作伙伴
+
+
开放协作,链接前沿技术,赋能合作伙伴,共筑可持续发展平台,共建软件开发新生态。
-
+ {/*
handleTabChange('partners')}> 合作伙伴 @@ -74,34 +95,34 @@ const EcosystemAlliance = () => { 项目贡献 -
+
*/} -
+ {/*
生态聚力 智创共赢
-
开放协作,与合作伙伴共拓市场蓝海。链接前沿技术,共建智慧产业新生态。赋能合作伙伴,
共筑可持续发展平台
+
开放协作,链接前沿技术,赋能合作伙伴,共筑可持续发展平台,共建软件开发新生态。
-
+
*/} -
- {partners1.map((i,key)=>{ - return
-
{i.title}
-
- {i.children.map((partner, index)=>{ - return
- {partner.name} -
- })} +
+ {partners1.map((i, key) => { + return
+
{i.title}
+
+ {i.children.map((partner, index) => { + return
+ {partner.name} +
+ })} +
-
- })} + })} +
- {/*
{ const forums = [ + { + id: 'software-factory', + title: '软件工厂技术交流分论坛', + description: '汇聚用户对“软件工厂”的功能/性能需求,交流讨论项目管理、\n软件质量管理、软件智能开发、软件流水线等方面的技术', + icon: require('../image/icon21.png') + }, { id: 'software-resources', - title: '软件资源需求分论坛', - description: '汇聚XX各单位对开源代码、三方组件、应用软件、\n模型数据、容器镜像等方面的资源需求', + title: '软件需求反馈分论坛', + description: '汇聚开源代码、三方组件、应用软件、模型数据、\n容器镜像等的软件应用反馈和资源需求', icon: require('../image/icon18.png') }, { id: 'supply-chain', title: '供应链治理分论坛', - description: '交流讨论对软件漏洞、软件溯源、\nSBOM等方面的知识', + description: '交流讨论软件漏洞、软件溯源、\n兼容性分析、SBOM等方面的知识', icon: require('../image/icon19.png') }, { id: 'open-source-development', title: '开源软件开发协作分论坛', - description: '交流讨论开源写作、漏洞治理、兼容性分析、\n缺陷修复、学习资源等方面的知识', + description: '交流讨论开源协作、技术创新、缺陷修复、\n学习资源等方面的知识', icon: require('../image/icon20.png') - }, - { - id: 'software-factory', - title: '软件工厂技术交流分论坛', - description: '汇聚用户对“软件工厂”的功能/性能需求,交流讨论项目管理、\n软件质量管理、软件智能开发、软件流水线等方面的知识', - icon: require('../image/icon21.png') } ]; @@ -55,36 +55,38 @@ const ForumExchange = () => {
论坛交流
-
- {forums.map((forum, index) => ( - -
- {forum.title} - {forum.title} -
{forum.description}
-
- {index !== forums.length - 1 && } -
- ))} -
- 论坛交流 - -
- {features.map((feature, index) => ( - -
- {feature.title} -
- {feature.title} -
{feature.description}
+
+
+ {forums.map((forum, index) => ( + +
+ {forum.title} + {forum.title} +
{forum.description}
-
- {index !== features.length - 1 && } - - ))} -
-
- {moreContentButton({href:"/forums", classname:"font-16 but-to-right font-bd color-white"})} + {index !== forums.length - 1 && } + + ))} +
+ 论坛交流 + +
+ {features.map((feature, index) => ( + +
+ {feature.title} +
+ {feature.title} +
{feature.description}
+
+
+ {index !== features.length - 1 && } +
+ ))} +
+
+ {moreContentButton({href:"/forums", classname:"font-16 but-to-right font-bd color-white"})} +
); diff --git a/src/forge/Main/projecthome/v2/components/openSourceCollaboration.jsx b/src/forge/Main/projecthome/v2/components/openSourceCollaboration.jsx index dd9c674e..d0a73b3c 100644 --- a/src/forge/Main/projecthome/v2/components/openSourceCollaboration.jsx +++ b/src/forge/Main/projecthome/v2/components/openSourceCollaboration.jsx @@ -5,7 +5,7 @@ const OpenSourceCollaboration = () => { { id: 'code-hosting', title: '软件代码托管', - description: '提供开源代码git协议访问、分支管理、版本管理、许可证管理等服务', + description: '提供开源代码Git协议访问、分支管理、版本管理、许可证管理等服务', icon: require('../image/icon11.png') }, { diff --git a/src/forge/Main/projecthome/v2/components/openSourceCollaboration1.jsx b/src/forge/Main/projecthome/v2/components/openSourceCollaboration1.jsx index 3a2578fe..eb21ce44 100644 --- a/src/forge/Main/projecthome/v2/components/openSourceCollaboration1.jsx +++ b/src/forge/Main/projecthome/v2/components/openSourceCollaboration1.jsx @@ -9,7 +9,7 @@ const OpenSourceCollaboration = ({isVisible}) => { const features = [ { title: '软件代码托管', - description: '提供开源代码git协议访问、分支管理、版本管理、许可证管理等服务', + description: '提供开源代码Git协议访问、分支管理、版本管理、许可证管理等服务', }, { title: '群智协同改进', @@ -32,53 +32,55 @@ const OpenSourceCollaboration = ({isVisible}) => { return (
开源协作
-
-
-
- {features.map((feature, index) => ( -
- - - {feature.title} - -
{feature.description}
+
+
+
+
+ {features.map((feature, index) => ( +
+ + + {feature.title} + +
{feature.description}
+
+ ))} + + +
+ +
+ +
+
- ))} - -
+
-
+
-
+
+ {active === 1 && + + } + {active === 2 && + + + + + + + } + +
- -
- -
- -
- {active === 1 && - - } - {active === 2 && - - - - - - - } - -
-
diff --git a/src/forge/Main/projecthome/v2/components/project.jsx b/src/forge/Main/projecthome/v2/components/project.jsx index 563c650f..9d99cd30 100644 --- a/src/forge/Main/projecthome/v2/components/project.jsx +++ b/src/forge/Main/projecthome/v2/components/project.jsx @@ -20,7 +20,7 @@ const RepositoryV2 = () => { { id: 'distribution', title: '资源高效可靠分发', - description: '高校分发、可靠传输、多节点部署' + description: '高效分发、可靠传输、多节点部署' }, { id: 'storage', @@ -39,53 +39,57 @@ const RepositoryV2 = () => { {/* 标题 */}
开源软件仓
- {/* 导航标签 */} -
- {tabs.map((tab) => ( -
- {tab.label} - {tab.label} -
- ))} -
+
+ + {/* 导航标签 */} +
+ {tabs.map((tab) => ( +
+ {tab.label} + {tab.label} +
+ ))} +
- {/* 主要内容区域 */} -
- {/* 左侧功能介绍 */} -
-
数据统一可控访问
+ {/* 主要内容区域 */} +
+ {/* 左侧功能介绍 */} +
+
丰富多样 · 开放共享 · 认证溯源
-
- {features.map((feature) => ( -
-
- - {feature.title} +
+ {features.map((feature) => ( +
+
+ + {feature.title} +
+
{feature.description}
-
{feature.description}
-
- ))} + ))} +
+ +
- -
- - {/* 右侧架构图 - 使用图片 */} -
- 开源仓库架构图 + {/* 右侧架构图 - 使用图片 */} +
+ 开源仓库架构图 +
+
diff --git a/src/forge/Main/projecthome/v2/components/softwareFactory.jsx b/src/forge/Main/projecthome/v2/components/softwareFactory.jsx index f1f6f407..b14abb89 100644 --- a/src/forge/Main/projecthome/v2/components/softwareFactory.jsx +++ b/src/forge/Main/projecthome/v2/components/softwareFactory.jsx @@ -22,20 +22,20 @@ function SoftwareFactory() { return (
软件工厂
-
+
敏捷模式 - 轻松搭建 + 全流程迭代演化
-
依托敏捷模式灵活迭代,高效协同推进,让产品搭建更轻松便
+
敏捷模式聚焦需求 - 任务 - 代码 - 迭代 - 测试 - 制品的全流程
数字化升级和在线化组织
极速模式 - 高效快构 + 高效率快速响应
极速模式聚焦任务 - 代码 - 制品,助力软件研发快速响应、
实现极致效率
diff --git a/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx b/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx index 5d8fb9ed..3b148bf8 100644 --- a/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx +++ b/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx @@ -7,7 +7,7 @@ const SupplyChainGovernance = () => { const governanceItems = [ { id: 'security', - title: '供应链安全XX库', + title: '供应链安全漏洞库', subtitle: '汇聚漏洞信息,恶意代码信息,组件信息三类关键供应链安全信息要素', image: require('../image/supply-chain-security.png').default, width: '40%', diff --git a/src/forge/Main/projecthome/v2/image/logo26.png b/src/forge/Main/projecthome/v2/image/logo26.png new file mode 100644 index 00000000..918a87e3 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo26.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo27.png b/src/forge/Main/projecthome/v2/image/logo27.png new file mode 100644 index 00000000..6ed40114 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo27.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo28.png b/src/forge/Main/projecthome/v2/image/logo28.png new file mode 100644 index 00000000..8088a65c Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo28.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo29.png b/src/forge/Main/projecthome/v2/image/logo29.png new file mode 100644 index 00000000..f0c52439 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo29.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo30.png b/src/forge/Main/projecthome/v2/image/logo30.png new file mode 100644 index 00000000..759935d2 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo30.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo31.png b/src/forge/Main/projecthome/v2/image/logo31.png new file mode 100644 index 00000000..275e0919 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo31.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo32.png b/src/forge/Main/projecthome/v2/image/logo32.png new file mode 100644 index 00000000..8e81e289 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo32.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo33.png b/src/forge/Main/projecthome/v2/image/logo33.png new file mode 100644 index 00000000..1d99999c Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo33.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo34.png b/src/forge/Main/projecthome/v2/image/logo34.png new file mode 100644 index 00000000..db25a987 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo34.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo35.png b/src/forge/Main/projecthome/v2/image/logo35.png new file mode 100644 index 00000000..084d8eaf Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo35.png differ diff --git a/src/forge/Main/projecthome/v2/image/logo36.png b/src/forge/Main/projecthome/v2/image/logo36.png new file mode 100644 index 00000000..1b4c5b75 Binary files /dev/null and b/src/forge/Main/projecthome/v2/image/logo36.png differ diff --git a/src/forge/Main/projecthome/v2/index.jsx b/src/forge/Main/projecthome/v2/index.jsx index 05d031d3..569aa69c 100644 --- a/src/forge/Main/projecthome/v2/index.jsx +++ b/src/forge/Main/projecthome/v2/index.jsx @@ -9,6 +9,7 @@ import OpenSourceCollaboration from './components/openSourceCollaboration1'; import SoftwareFactory from './components/softwareFactory'; import Forum from './components/forum'; import EcosystemAlliance from './components/ecosystemAlliance'; +import './animation.scss'; function Index(props) { const observer = useRef(); @@ -31,9 +32,7 @@ function Index(props) { } }); }, { - root: null, - rootMargin: '0px', - threshold: 0.1 + threshold: 0.3 }); // 观察所有子组件 diff --git a/src/forge/Main/projecthome/v2/index.scss b/src/forge/Main/projecthome/v2/index.scss index 041eeda3..d24170fb 100644 --- a/src/forge/Main/projecthome/v2/index.scss +++ b/src/forge/Main/projecthome/v2/index.scss @@ -563,7 +563,8 @@ flex: 1; margin-top: 30px; height: 335px; - background-image: url('./image/software-assessment.png'), linear-gradient(156.13deg, #4f73f6 0%, #7babff 100%); + // background-image: url('./image/software-assessment.png'), linear-gradient(156.13deg, #4f73f6 0%, #7babff 100%); + background-image: url('./image/software-assessment.png'), linear-gradient(100.13deg, #4f73f600 0%, #7babff3c 100%); background-size: auto 100%; background-position: right; background-repeat: no-repeat; @@ -572,8 +573,8 @@ background-color:#f8f3ff; } .tag-value { - color:#091221; - background-color:#ffffff; + // color:#091221; + // background-color:#ffffff; } .governance-item-title{ padding-top: 20px; @@ -581,7 +582,7 @@ } div { - color: white; + // color: white; } } } @@ -782,6 +783,7 @@ background-image: url('./image/bk3.png'); background-size: 100% auto; background-repeat: no-repeat; + background-position-y: -90px; padding: 90px 20px 60px 20px; .tabs_v2 { diff --git a/src/forge/projectHome/projectList/index.jsx b/src/forge/projectHome/projectList/index.jsx index 080ab88d..d2bb12e2 100644 --- a/src/forge/projectHome/projectList/index.jsx +++ b/src/forge/projectHome/projectList/index.jsx @@ -199,7 +199,7 @@ function ProjectList() { {i.forked_count > 0 ? fork{i.forked_count} : ""}
-
+
{i.description}
diff --git a/src/forums/api.js b/src/forums/api.js index c668d875..b9c76d81 100644 --- a/src/forums/api.js +++ b/src/forums/api.js @@ -9,7 +9,7 @@ export function getForumsList(params) { } export function getForumSections(id, params) { return fetch({ - url: `/api/forum_sections/${id}/managements`, + url: `/api/memos/forum_memos_right/${id}.json`, method: 'get', params }); diff --git a/src/forums/list/index.jsx b/src/forums/list/index.jsx index f9e32cc4..dd216869 100644 --- a/src/forums/list/index.jsx +++ b/src/forums/list/index.jsx @@ -8,6 +8,7 @@ import icon5 from '../image/icon5.png'; import icon6 from '../image/icon6.png'; import icon10 from '../image/icon10.png'; import Nodata from "../../forge/Nodata"; +import { forumSectionId } from "../static"; function List(props) { const {mygetHelmetapi} = props; @@ -22,6 +23,8 @@ function List(props) { const [forumTagDetail, setForumTagDetail] = useState(undefined); // 选中的板块对应的帖子列表 const [forumListByTag, setForumListByTag] = useState([]); + console.log('forumTag', forumTag); + const sortImg1 = { 0: require('../image/icon7.png'), @@ -51,10 +54,10 @@ function List(props) { } }) - getForumSections(4).then(res => { - if (res && res.forum_tag) { + getForumSections(forumSectionId).then(res => { + if (res && res.recommend_forum_sections) { // 获取所有子板块 - const childrenTags = res.forum_tag.children_tags; + const childrenTags = res.recommend_forum_sections; // 并发请求所有板块的精华帖子 const fetchEssencePosts = async (tag) => { @@ -169,7 +172,7 @@ function List(props) { const forums = item.essencePosts[0] || {}; return (
{setForumTagDetail(item)}}> -
{item.title}
+
{item.title}
{forums.memo_image_info && }
diff --git a/src/forums/list/index.scss b/src/forums/list/index.scss index 5258d429..1a2fe716 100644 --- a/src/forums/list/index.scss +++ b/src/forums/list/index.scss @@ -135,8 +135,10 @@ color: white; } } - img:not(.user-img){ - max-width: 100%; + .memo_image_info{ + width: 100%; + height: 160px; + object-fit: cover; border-radius: 15px 15px 0 0; transition: transform .4s cubic-bezier(.25, .46, .45, .94); } diff --git a/src/forums/static.js b/src/forums/static.js new file mode 100644 index 00000000..39566c4a --- /dev/null +++ b/src/forums/static.js @@ -0,0 +1,2 @@ +// 论坛首页,下面四个分论坛对应的一级板块id +export const forumSectionId = 4 \ No newline at end of file diff --git a/src/news/list/index.jsx b/src/news/list/index.jsx index 5d2490fb..5936dba9 100644 --- a/src/news/list/index.jsx +++ b/src/news/list/index.jsx @@ -115,7 +115,7 @@ function List() {
项目动态
{firstDynamics &&
-
{firstDynamics.name}
+
{firstDynamics.name}
{firstDynamics.summary}
{/* */}
} @@ -123,10 +123,10 @@ function List() { {list3.slice(1, 9).map(item=>{ return
- {item.name} - {moment(item.publishTime).format('YYYY-MM-DD')} + {item.name} + {moment(item.publishTime).format('YYYY-MM-DD')}
-
{item.summary}
+
{item.summary}
}) } diff --git a/src/news/list/index.scss b/src/news/list/index.scss index 33f71a5c..0f90161d 100644 --- a/src/news/list/index.scss +++ b/src/news/list/index.scss @@ -112,6 +112,7 @@ margin-right: 20px; width: 25%; min-height: 420px; + flex-shrink: 0; } .dynamics-box{ background-image:linear-gradient(179.88deg,#ffffff 0%,rgba(255, 255, 255, 0.62) 16.1%,rgba(255, 255, 255, 0) 100%);