Merge branch 'release_20220701' into 'master'

【生产】7.1版本同步到master

See merge request eshop/fe_service_ebtp_frontend!159

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) => {
@@ -22,6 +24,7 @@ const PersonInfor: React.FC<{}> = () => {
       if (res?.code == 200) {
         const data = await getImageUrl(res?.data, 'image', topic_activity_default);
         setGracefulList(data);
+        setPage(1);
       }
     }).finally(() => {
       setLoading(false);
@@ -36,9 +39,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 +56,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 +78,10 @@ const PersonInfor: React.FC<{}> = () => {
             itemLayout="horizontal"
             pagination={{
               size: 'small',
+              onChange: page => {
+                setPage(page);
+              },
+              current: page,
               showTotal: (total) => `共 ${total} 条`,
               pageSize: 10,
             }}

src/pages/PartyMemberTopic/Home/index.less

@@ -278,17 +278,17 @@
                                 font-size: 12px;
                                 letter-spacing: 1px;
 
-                                .right-display-content-percentage {
+                                // .right-display-content-percentage {
-                                    margin-left: 8px;
+                                //     margin-left: 8px;
 
-                                    .right-display-content-percentage-increase {
+                                //     .right-display-content-percentage-increase {
-                                        color: #28e099;
+                                //         color: #28e099;
-                                    }
+                                //     }
 
-                                    .right-display-content-percentage-reduce {
+                                //     .right-display-content-percentage-reduce {
-                                        color: #eb5527;
+                                //         color: #eb5527;
-                                    }
+                                //     }
-                                }
+                                // }
                             }
 
                             .right-display-content-content {
@@ -535,7 +535,7 @@
     align-items: center;
 
     .radio-group {
-        width: 260px;
+        width: 300px;
         margin-bottom: 12px;
 
         .radio-content {

src/pages/PartyMemberTopic/Home/index.tsx

@@ -51,9 +51,7 @@ const RightDisplayTitle = (props: any) => {
 //右侧专业线内容
 const RightDisplayContent = (props: any) => {
     const displayContentClick = () => {
-        if (props.index == 0) {//党员数量
+        if (props.index == 0 || props.index == 1) {//党员数量 //党支部数量
-            window.open("/partyMemberTopic/personInfor");
-        } else if (props.index == 1) {//党支部数量
             window.open("/partyMemberTopic/partyBranch");
         }
     }
@@ -64,14 +62,14 @@ const RightDisplayContent = (props: any) => {
                 <div className='right-display-content-right'>
                     <div className='right-display-content-title'>
                         <span>{props.data[props.index].dataName}</span>
-                        {props.data[props.index].dataCompare != null && <span className='right-display-content-percentage'>
+                        {/* {props.data[props.index].dataCompare != null && <span className='right-display-content-percentage'>
                             <span>同比</span>
                             {props.data[props.index].dataCompare[0] == '+' ? (
                                 <span className='right-display-content-percentage-increase'>{props.data[props.index].dataCompare} ↑</span>
                             ) : (
                                 <span className='right-display-content-percentage-reduce'>{props.data[props.index].dataCompare} ↓</span>
                             )}
-                        </span>}
+                        </span>} */}
                     </div>
                     <div className='right-display-content-content'>
                         <span className={`right-display-content-number ${props.color}`}>{props.data[props.index].dataValue}</span>
@@ -214,11 +212,12 @@ const CommentModal = (props: any) => {
             <Spin spinning={modalLoading}>
                 <div className='bottom-modal-body'>
                     <div className='radio-group'>
-                        <Radio.Group onChange={onRadioChange} defaultValue={"1"}>
+                        <Radio.Group onChange={onRadioChange} defaultValue={"网络运营"}>
-                            <Radio value="1" className="radio-content">系统优化</Radio>
+                            <Radio value="网络运营" className="radio-content">网络运营</Radio>
-                            <Radio value="2" className="radio-content">制度优化</Radio>
+                            <Radio value="IT" className="radio-content">IT</Radio>
-                            <Radio value="3" className="radio-content">组织优化</Radio>
+                            <Radio value="市场" className="radio-content">市场</Radio>
-                            <Radio value="4" className="radio-content">其他</Radio>
+                            <Radio value="综合行政" className="radio-content">综合行政</Radio>
+                            <Radio value="其他" className="radio-content">其他</Radio>
                         </Radio.Group>
                     </div>
                     <TextArea
@@ -476,8 +475,8 @@ const Home: React.FC<{}> = () => {
                         </div>
                         <div className='right-display'>
                             <RightDisplayTitle title="党员及支部数量情况" />
-                            <RightDisplayContent index={0} data={rightList} img={topic_partymember} color="number-blue" />
                             <RightDisplayContent index={1} data={rightList} img={topic_partybranch} color="number-blue" />
+                            <RightDisplayContent index={0} data={rightList} img={topic_partymember} color="number-blue" />
                         </div>
                         <Divider className='right-divider' />
                         <div className='right-display'>
@@ -504,7 +503,7 @@ const Home: React.FC<{}> = () => {
                     </div>
                 </div>
                 <div className='bottom-global'>
-                    <LeftCardTop title="活动联系人" />
+                    <LeftCardTop title="我要提意见" />
                     {contactData.length > 0 && contactData.map(([name, value], index) => (
                         <div key={index}>
                             <div className='bottom-title'>{name}</div>

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) => {
@@ -19,6 +21,7 @@ const PersonInfor: React.FC<{}> = () => {
     getProjectList({ param: value }).then(res => {
       if (res?.code == 200) {
         setProjectList(res?.data);
+        setPage(1);
       }
     }).finally(() => {
       setLoading(false);
@@ -34,9 +37,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 +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>}
+          {projectList.length != 0 && page < Math.ceil(projectList.length / 10) && <span onClick={() => toNextPage()}>下一页</span>}
         </div>
       </div>
       <Spin spinning={loading}>
@@ -69,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/PartyBranch/index.tsx

@@ -48,6 +48,11 @@ const PartyBranch: React.FC<{}> = () => {
     history.push("/partyMemberTopic/home");
   }
 
+  //to total personInfor
+  const personNumClick = () => {
+    history.push({ pathname: "/partyMemberTopic/personInfor" });
+  }
+
   useEffect(() => {
     getMemberNumber();
     getBranchData();
@@ -72,7 +77,7 @@ const PartyBranch: React.FC<{}> = () => {
         </div>
       </div>
       <div className="static-box">
-        <div className="person-num">党员数量<span>{memberNumber?.member}</span>人</div>
+        <div className="person-num" onClick={() => personNumClick()}>党员数量<span>{memberNumber?.member}</span>人</div>
         <div className="party-num">党支部数量<span>{memberNumber?.branch}</span>个</div>
       </div>
       <div className="mess-box">

src/pages/PartyMemberTopic/PersonInfor/index.tsx

@@ -59,7 +59,7 @@ const PersonInfor: React.FC<{}> = (props: any) => {
 
   return (
     <div className="page-container">
-      <div className="top-banner">
+      <div className="top-banner member-top-banner">
         <div className="back-home">
           <span onClick={() => toHome()}>返回首页</span>
           <span onClick={() => toGoBack()}>上一页</span>

src/pages/PartyMemberTopic/Style/ld_style.less

@@ -35,6 +35,10 @@
     }
   }
 
+  .member-top-banner {
+    background: url("../../../assets/topic/bannerListPic_member.jpg") no-repeat;
+  }
+
   .search {
     height: 68px;
     line-height: 64px;
@@ -81,6 +85,7 @@
       position: absolute;
       right: 360px;
       top: 24px;
+      cursor: pointer;
     }
 
     .party-num {