7.1 活动风采列表和攻坚克难列表增加上一页和下一页

src/pages/PartyMemberTopic/ActivityStyle/index.tsx

@@ -14,6 +14,8 @@ const PersonInfor: React.FC<{}> = () => {
   const [gracefulList, setGracefulList] = useState<any[]>([]);
   //loading
   const [loading, setLoading] = useState<boolean>(false);
+  //page
+  const [page, setPage] = useState<number>(1);
 
   //get graceful
   const getGracefulData = (value: string) => {
@@ -36,9 +38,13 @@ const PersonInfor: React.FC<{}> = () => {
   const toHome = () => {
     history.push("/partyMemberTopic/home");
   }
-  //goback lastpage
+  //to previous page
-  const toGoBack = () => {
+  const toPreviousPage = () => {
-    window.history.go(-1);
+    setPage((page) => page - 1);
+  }
+  //to next page
+  const toNextPage = () => {
+    setPage((page) => page + 1);
   }
 
   useEffect(() => {
@@ -49,7 +55,8 @@ const PersonInfor: React.FC<{}> = () => {
       <div className="top-banner">
         <div className="back-home">
           <span onClick={() => toHome()}>返回首页</span>
-          <span onClick={() => toGoBack()}>上一页</span>
+          {page > 1 && <span onClick={() => toPreviousPage()}>上一页</span>}
+          {gracefulList.length != 0 && page < Math.ceil(gracefulList.length / 10) && <span onClick={() => toNextPage()}>下一页</span>}
         </div>
       </div>
       <Spin spinning={loading}>
@@ -70,6 +77,10 @@ const PersonInfor: React.FC<{}> = () => {
             itemLayout="horizontal"
             pagination={{
               size: 'small',
+              onChange: page => {
+                setPage(page);
+              },
+              current: page,
               showTotal: (total) => `共 ${total} 条`,
               pageSize: 10,
             }}

src/pages/PartyMemberTopic/OverDifficult/index.tsx

@@ -12,6 +12,8 @@ const PersonInfor: React.FC<{}> = () => {
   const [projectList, setProjectList] = useState<any[]>([]);
   //loading
   const [loading, setLoading] = useState<boolean>(false);
+  //page
+  const [page, setPage] = useState<number>(1);
 
   //get project
   const getProjectData = (value: string) => {
@@ -34,9 +36,13 @@ const PersonInfor: React.FC<{}> = () => {
   const toHome = () => {
     history.push("/partyMemberTopic/home");
   }
-  //goback lastpage
+  //to previous page
-  const toGoBack = () => {
+  const toPreviousPage = () => {
-    window.history.go(-1);
+    setPage((page) => page - 1);
+  }
+  //to next page
+  const toNextPage = () => {
+    setPage((page) => page + 1);
   }
 
   useEffect(() => {
@@ -48,7 +54,8 @@ const PersonInfor: React.FC<{}> = () => {
       <div className="top-banner">
         <div className="back-home">
           <span onClick={() => toHome()}>返回首页</span>
-          <span onClick={() => toGoBack()}>上一页</span>
+          {page > 1 && <span onClick={() => toPreviousPage()}>上一页</span>}
+          {projectList.length != 0 && page < Math.ceil(projectList.length / 10) && <span onClick={() => toNextPage()}>下一页</span>}
         </div>
       </div>
       <Spin spinning={loading}>
@@ -69,6 +76,10 @@ const PersonInfor: React.FC<{}> = () => {
             itemLayout="horizontal"
             pagination={{
               size: 'small',
+              onChange: page => {
+                setPage(page);
+              },
+              current: page,
               showTotal: (total) => `共 ${total} 条`,
               pageSize: 10,
             }}