7.1 党建攻坚修改

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>
@@ -215,10 +213,11 @@ const CommentModal = (props: any) => {
                 <div className='bottom-modal-body'>
                     <div className='radio-group'>
                         <Radio.Group onChange={onRadioChange} defaultValue={"1"}>
-                            <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/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 {