diff --git a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx index 9a42d98..44d42d8 100644 --- a/src/pages/PartyMemberTopic/ActivityStyle/index.tsx +++ b/src/pages/PartyMemberTopic/ActivityStyle/index.tsx @@ -14,6 +14,8 @@ const PersonInfor: React.FC<{}> = () => { const [gracefulList, setGracefulList] = useState([]); //loading const [loading, setLoading] = useState(false); + //page + const [page, setPage] = useState(1); //get graceful const getGracefulData = (value: string) => { @@ -36,9 +38,13 @@ const PersonInfor: React.FC<{}> = () => { const toHome = () => { history.push("/partyMemberTopic/home"); } - //goback lastpage - const toGoBack = () => { - window.history.go(-1); + //to previous page + const toPreviousPage = () => { + setPage((page) => page - 1); + } + //to next page + const toNextPage = () => { + setPage((page) => page + 1); } useEffect(() => { @@ -49,7 +55,8 @@ const PersonInfor: React.FC<{}> = () => {
toHome()}>返回首页 - toGoBack()}>上一页 + {page > 1 && toPreviousPage()}>上一页} + {gracefulList.length != 0 && page < Math.ceil(gracefulList.length / 10) && toNextPage()}>下一页}
@@ -70,6 +77,10 @@ const PersonInfor: React.FC<{}> = () => { itemLayout="horizontal" pagination={{ size: 'small', + onChange: page => { + setPage(page); + }, + current: page, showTotal: (total) => `共 ${total} 条`, pageSize: 10, }} diff --git a/src/pages/PartyMemberTopic/OverDifficult/index.tsx b/src/pages/PartyMemberTopic/OverDifficult/index.tsx index bc7f582..73ec67e 100644 --- a/src/pages/PartyMemberTopic/OverDifficult/index.tsx +++ b/src/pages/PartyMemberTopic/OverDifficult/index.tsx @@ -12,6 +12,8 @@ const PersonInfor: React.FC<{}> = () => { const [projectList, setProjectList] = useState([]); //loading const [loading, setLoading] = useState(false); + //page + const [page, setPage] = useState(1); //get project const getProjectData = (value: string) => { @@ -34,9 +36,13 @@ const PersonInfor: React.FC<{}> = () => { const toHome = () => { history.push("/partyMemberTopic/home"); } - //goback lastpage - const toGoBack = () => { - window.history.go(-1); + //to previous page + const toPreviousPage = () => { + setPage((page) => page - 1); + } + //to next page + const toNextPage = () => { + setPage((page) => page + 1); } useEffect(() => { @@ -48,7 +54,8 @@ const PersonInfor: React.FC<{}> = () => {
toHome()}>返回首页 - toGoBack()}>上一页 + {page > 1 && toPreviousPage()}>上一页} + {projectList.length != 0 && page < Math.ceil(projectList.length / 10) && toNextPage()}>下一页}
@@ -69,6 +76,10 @@ const PersonInfor: React.FC<{}> = () => { itemLayout="horizontal" pagination={{ size: 'small', + onChange: page => { + setPage(page); + }, + current: page, showTotal: (total) => `共 ${total} 条`, pageSize: 10, }}