-
+
+ })}
-
- })
{countByOther}+
-
- })
{countByGHMType}+
-
- })
{countByGHM}+
-
- })
{countByMX}+
-
+ {count.map((item, index)=>{
+ const logoIndex = index%5
+ return })
{countByRQ}+
+
+ {index < count.length-1 && {item.value}
反馈需求，共建优质体验
diff --git a/src/forge/projectHome/projectList/index.scss b/src/forge/projectHome/projectList/index.scss
index 205f545f2..a4eaff96d 100644
--- a/src/forge/projectHome/projectList/index.scss
+++ b/src/forge/projectHome/projectList/index.scss
@@ -46,7 +46,7 @@
position: absolute;
right: 0px;
font-size: 16px;
- top: 5px;
+ top: 6px;
}
}
diff --git a/src/forums/list/index.jsx b/src/forums/list/index.jsx
index be4244ea7..c31985bc8 100644
--- a/src/forums/list/index.jsx
+++ b/src/forums/list/index.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import './index.scss';
-import { Button, Carousel, Divider, Tag } from "antd";
+import { Button, Carousel, Divider, Pagination, Tag } from "antd";
import { getForumsById, getForumSections, getForumsList } from "../api";
import { httpUrl } from "../fetch";
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
@@ -22,6 +22,9 @@ function List(props) {
// 选中的板块详情
const [forumTagDetail, setForumTagDetail] = useState(undefined);
// 选中的板块对应的帖子列表
+ const LIMIT = 10;
+ const [total, setTotal] = useState(0);
+ const [page, setPage] = useState(1);
const [forumListByTag, setForumListByTag] = useState([]);
// 轮播的active
const [activeId, setActiveId] = useState(0);
@@ -106,18 +109,19 @@ function List(props) {
if (forumTagDetail && forumTagDetail.id) {
const forums = forumTagDetail.essencePosts[0] || {}
getForumsById(forumTagDetail.id, {
- page: 1,
- limit: 10,
+ page: page,
+ limit: LIMIT,
sort: 'published_at',
select_type: 'all',
hide_id: forums.id
}).then(res => {
if (res) {
setForumListByTag(res.memos || []);
+ setTotal(res.memos_count);
}
})
}
- }, [forumTagDetail && forumTagDetail.id])
+ }, [forumTagDetail && forumTagDetail.id, page])
return (
@@ -128,7 +132,7 @@ function List(props) {
{forumsDoMain && }
- {setActiveId(current)}}>
+ {setActiveId(current)}}>
{forumsImgList.map((item, index)=>{
return 
})}
@@ -200,10 +204,11 @@ function List(props) {
{/* 板块对应的帖子列表 */}
- {forumListByTag.map((item, index) => (
-
diff --git a/src/news/image/bk3.png b/src/news/image/bk3.png
index 8921895fa..6867bf081 100644
Binary files a/src/news/image/bk3.png and b/src/news/image/bk3.png differ
diff --git a/src/news/image/bk8.png b/src/news/image/bk8.png
new file mode 100644
index 000000000..0a63b24aa
Binary files /dev/null and b/src/news/image/bk8.png differ
diff --git a/src/news/image/icon13.png b/src/news/image/icon13.png
new file mode 100644
index 000000000..9dc5ee016
Binary files /dev/null and b/src/news/image/icon13.png differ
diff --git a/src/news/image/icon14.png b/src/news/image/icon14.png
new file mode 100644
index 000000000..d81e42062
Binary files /dev/null and b/src/news/image/icon14.png differ
diff --git a/src/news/list/index.jsx b/src/news/list/index.jsx
index 5936dba9a..481a58860 100644
--- a/src/news/list/index.jsx
+++ b/src/news/list/index.jsx
@@ -7,13 +7,15 @@ import "./index.scss";
import moment from "moment";
import RenderHtml from "../../components/render-html";
import icon2 from '../image/icon2.png'
+import icon13 from '../image/icon13.png'
+import icon14 from '../image/icon14.png'
function List() {
const [list1, setList1] = useState([]);
const [list2, setList2] = useState([]);
const [firstActivity, setFirstActivity] = useState(undefined);
const [list3, setList3] = useState([]);
- const firstDynamics = list3[0]
+ const firstDynamics = list3.slice(0,2);
useEffect(() => {
document.title = "社区动态";
@@ -38,7 +40,7 @@ function List() {
})
}
})
- getSubDocList(39).then(res => {
+ getSubDocList(39, {orderByColumn: "publishTime", isAsc: 'desc'}).then(res => {
if (res && res.data.rows) {
let rows = res.data.rows;
setList3(rows);
@@ -114,13 +116,17 @@ function List() {
+ {forumListByTag.map((item, index) => {
+ const orderIndex = index+LIMIT*(page-1)
+ return
{ setPage(page) }} className='center mt30' />
- {index < 3 ? 
: {index + 1}}
+ {orderIndex < 3 ? 
: {orderIndex + 1}}
{item.subject}
{item.sticky && 置顶 }
{item.is_original && 原创 }
@@ -224,10 +229,11 @@ function List(props) {
{item.viewed_count}
- ))}
+ })}
{forumListByTag.length === 0 && (
项目动态
- {firstDynamics &&
-
{firstDynamics.name}
- {firstDynamics.summary}
- {/* */}
+ {firstDynamics && firstDynamics.length &&
+ {firstDynamics.map((item, index)=>{
+ return
}
+ 
+
+ })}
{item.name}
+ {item.summary}
+
- {list3.slice(1, 9).map(item=>{
+ {list3.slice(2, 10).map(item=>{
return
{item.name}
diff --git a/src/news/list/index.scss b/src/news/list/index.scss
index 82e23c819..93844d642 100644
--- a/src/news/list/index.scss
+++ b/src/news/list/index.scss
@@ -114,6 +114,24 @@
min-height: 420px;
flex-shrink: 0;
}
+.firstDynamics-box{
+ margin-right: 20px;
+ width: 25%;
+ flex-shrink: 0;
+ display: flex;
+ flex-direction: column;
+ gap: 20px;
+ justify-content: space-between;
+}
+.firstDynamics-item{
+ border-radius: 10px;
+ padding: 20px 15px;
+ background-image: url('../image/bk3.png');
+ background-size: 100% 100%;
+ &:nth-child(2){
+ background-image: url('../image/bk8.png');
+ }
+}
.dynamics-box{
background-image:linear-gradient(179.88deg,#ffffff 0%,rgba(255, 255, 255, 0.62) 16.1%,rgba(255, 255, 255, 0) 100%);
border-radius:40px 40px 0 0;