From 0d2fb2e0ea6804bf48d296cc1f60c0ec5f1bf7f9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 30 May 2023 17:32:55 +0800
Subject: [PATCH] bug

---
 .../Information/Component/publicBanner.jsx    |  16 +--
 src/forge/Information/Pages/headerPage.jsx    |  24 ++---
 src/forge/Information/Pages/main.jsx          |  75 +++++++++-----
 src/forge/Information/Pages/newsList.jsx      |  10 +-
 src/forge/Information/Pages/projectSource.jsx |  15 ++-
 src/forge/Information/Pages/zoneVIP.jsx       |   7 ++
 src/forge/Information/img/menu6.png           | Bin 4824 -> 5521 bytes
 src/forge/Information/img/menu7.png           | Bin 0 -> 3136 bytes
 src/forge/Information/index.jsx               |   6 +-
 src/forge/Information/index.scss              |  95 ++++++++++++++----
 10 files changed, 176 insertions(+), 72 deletions(-)
 create mode 100644 src/forge/Information/img/menu7.png

diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx
index 3f93e9e5d..d763f7809 100644
--- a/src/forge/Information/Component/publicBanner.jsx
+++ b/src/forge/Information/Component/publicBanner.jsx
@@ -6,16 +6,20 @@ import Menu3 from '../img/menu3.png';
 import Menu4 from '../img/menu4.png';
 import Menu5 from '../img/menu5.png';
 import Menu6 from '../img/menu6.png';
+import Menu7 from '../img/menu7.png';
+import banner from '../img/mainbanner.png'
 import { Link } from 'react-router-dom';
 
 
 
 function PublicBanner(props){
   const [ key , setKey ] = useState("1");
+  const { deptId } = props.match.params;
   const { pathname } = props.history.location;
   const { data , adminUrl } = props;
 
 
+
   useEffect(()=>{
     if(pathname){
       const head = /\/information\/[0-9]{0,}/g;
@@ -39,7 +43,7 @@ function PublicBanner(props){
   },[pathname])
 
   return(
-    <div className="in_banner">
+    <div className="in_banner" style={{backgroundImage:`url(${(data && data.bannerList) || banner})`}}>
       {
         data && 
         <div>
@@ -49,13 +53,13 @@ function PublicBanner(props){
       }
       <div className="bannerMenus">
         <Menu mode={"horizontal"} selectedKeys={[key]}>
-          <Menu.Item key={"1"}><Link to={`/information/1`}><img src={Menu1} alt="" width="29px"/>首页</Link></Menu.Item>
-          <Menu.Item key={"2"}><Link to={`/information/1/projects`}><img src={Menu2} alt="" width="34px"/>开源项目</Link></Menu.Item>
+          <Menu.Item key={"1"}><Link to={`/information/${deptId}`}><img src={Menu1} alt="" width="29px"/>首页</Link></Menu.Item>
+          <Menu.Item key={"2"}><Link to={`/information/${deptId}/projects`}><img src={Menu2} alt="" width="34px"/>开源项目</Link></Menu.Item>
           {/* <Menu.Item key={"3"}><img src={Menu3} alt="" width="33px"/>资源发布</Menu.Item> */}
-          <Menu.Item key={"4"}><Link to={`/information/1/news`}><img src={Menu4} alt="" width="32px"/>领域资讯</Link></Menu.Item>
+          <Menu.Item key={"4"}><Link to={`/information/${deptId}/news`}><img src={Menu4} alt="" width="32px"/>领域资讯</Link></Menu.Item>
           {/* <Menu.Item key={"5"}><img src={Menu5} alt="" width="27px"/>Sig小组</Menu.Item> */}
-          <Menu.Item key={"6"}><Link to={`/information/1/VIP`}><img src={Menu6} alt="" width="27px"/>专区会员</Link></Menu.Item>
-          { adminUrl && <Menu.Item key={"6"}><a onClick={()=>{window.location.href=adminUrl}}><img src={Menu6} alt="" width="27px"/>后台管理</a></Menu.Item> }
+          <Menu.Item key={"6"}><Link to={`/information/${deptId}/VIP`}><img src={Menu6} alt="" width="36px"/>专区会员</Link></Menu.Item>
+          { adminUrl && <Menu.Item key={"6"}><a onClick={()=>{window.location.href=adminUrl}}><img src={Menu7} alt="" width="34px"/>后台管理</a></Menu.Item> }
         </Menu>
       </div>
     </div>
diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx
index 9d4371d80..020252ec4 100644
--- a/src/forge/Information/Pages/headerPage.jsx
+++ b/src/forge/Information/Pages/headerPage.jsx
@@ -49,18 +49,18 @@ function HeaderPage(props){
   }
   return(
     <div className="zone_box">
-      <p className="in_title">{data && data.name}</p>
+      <p className="in_title">{data && data.firstTitle}</p>
       <div className="boxmain zone_infos">
         {
           data &&
           <div className="zone_infos_desc">
-            <p className="z_name">{data.name}</p>
-            <p className="z_desc">{data.introductionContent}</p>
+            <p className="z_name">{data.introductionTitle}</p>
+            <p className="z_desc task-hide-2">{data.introductionContent}</p>
           </div>
         }
         {
           data && data.introductionImage &&
-          <img src={data.introductionImage} alt="" width="512px" height="330px"/>
+          <img src={data.introductionImage} alt="" width="474px" height="277px"/>
         }
       </div>
       <div className="zone_news">
@@ -69,18 +69,18 @@ function HeaderPage(props){
           newsList && newsList.length>0 &&
           <div className="boxmain" style={{display:"flex"}}>
             <div className="zone_new_first">
-              <img src={img1} alt="" height="302px" className="mb30"/>
+              <img src={newsList[0].headImg || img1} alt="" height="302px" className="mb30"/>
               <p className="zone_n_title task-hide">{newsList[0].name}</p>
               <p className="zone_n_desc task-hide-2">{newsList[0].summary}</p>
-              <p className="font-13 mt10" style={{color:"#8d95a3"}}>
+              <p className="font-13 mt10 flexCenter" style={{color:"#8d95a3"}}>
                 <img src={shijian} alt="" className="mr3" />
                 {newsList[0].publishTime}
               </p>
               <p className="mt15">
-                <Link to={`/information/${deptId}/newdetail/${newsList[0].id}`} className="color-blue">查看详情<img src={guideArrow} alt="" width="14px" className="ml3"/></Link>
+                <Link to={`/information/${deptId}/newdetail/${newsList[0].id}`} className="color-blue flexCenter zone_btn">查看详情<img src={guideArrow} alt="" width="14px" className="ml3"/></Link>
               </p>
             </div>
-            <ul className="zone_new_three">
+            <ul className={`zone_new_three ${newsList.length <4 ? "flexStart" : "spaceeTween"}`}>
               {
                 newsList.map((i,k)=>{
                   return(
@@ -92,7 +92,7 @@ function HeaderPage(props){
                           <img src={shijian} alt="" className="mr3" />
                           {i.publishTime}
                         </span>
-                        <Link  to={`/information/${deptId}/newdetail/${i.id}`} className="color-blue">查看详情<img src={guideArrow} alt="" width="14px"/></Link>
+                        <Link  to={`/information/${deptId}/newdetail/${i.id}`} className="color-blue flexCenter zone_btn">查看详情<img src={guideArrow} alt="" width="14px"/></Link>
                       </p>
                     </li>
                   )
@@ -111,9 +111,9 @@ function HeaderPage(props){
               projectList.map((i,k)=>{
                 return(
                   <li>
-                    {i.projectProperties && i.projectProperties.authorImageUrl && <img src={i.projectProperties.authorImageUrl} alt="" /> }
-                    <div>
-                      <a  onClick={()=>window.open(i.projectURL)} className="z_p_title">{i.projectProperties && i.projectProperties.fullName}</a>
+                    <div className="imgBox">{i.projectProperties && i.projectProperties.authorImageUrl && <img src={i.projectProperties.authorImageUrl} alt="" /> }</div>
+                    <div className="infoBox">
+                      <a  onClick={()=>window.open(i.projectURL)} className="z_p_title">{i.projectProperties && i.projectProperties.name}</a>
                        <p className="z_p_desc task-hide-2">{i.projectProperties && i.projectProperties.description ? i.projectProperties.description : "暂无~"}</p>
                     </div>
                   </li>
diff --git a/src/forge/Information/Pages/main.jsx b/src/forge/Information/Pages/main.jsx
index efb28b48b..0b529f7d1 100644
--- a/src/forge/Information/Pages/main.jsx
+++ b/src/forge/Information/Pages/main.jsx
@@ -30,7 +30,11 @@ function Main(props){
 
   function getMainList(){
     const url = `/cms/doc/open/zone/${deptId}/docOverviewList`;
-    axios.get(url).then(result=>{
+    axios.get(url,{
+      params:{
+        pageSize:10,pageNum:1
+      }
+    }).then(result=>{
       if(result){
         setMainList(result.data.rows);
         setIsSpin(false);
@@ -52,11 +56,23 @@ function Main(props){
   function clickTab(k,idName){
     setKey(k);
   }
+  // const hash = props.history.location.hash;
+
+  // useEffect(()=>{
+  //   if(hash){
+  //     setTimeout(()=>{
+  //       let top =document.documentElement.scrollTop;
+  //       console.log(document.documentElement.scrollTop);
+  //       window.scrollTo(0,top-120);
+  //     },50)
+  //   }
+  // },[hash])
 
   return(
     <div>
       {/* <Banner {...props}/> */}
       <div className="main_content">
+        <div id={`main_card_item_1`} style={{opacity:"0"}}></div>
         <p className="in_title">领域资讯</p>
         {
           mainList && mainList.length>0 &&
@@ -82,42 +98,47 @@ function Main(props){
                   mainList && mainList.length>0 &&
                   mainList.map((i,k)=>{
                     return(
-                      <div className="main_card radius4" id={`main_card_item_${k+1}`}>
+                      <div className="main_card radius4">
                         <div className="guide">
-                          <span>{i.name}</span>
-                          <Link to={`/information/${deptId}/news/${i.id}`}>更多<img src={guideArrow} alt="" width="14px"/></Link>
+                          <span><span className="task-hide">{i.name}</span></span>
+                          <Link className="flexCenter" to={`/information/${deptId}/news/${i.id}`}>更多<img src={guideArrow} alt="" width="14px"/></Link>
                         </div>
                         <div>
                           {
-                            i.cmsDocList && i.cmsDocList.length>0 ? 
-                            i.cmsDocList.map((j,e)=>{
-                              return(
-                                <div className="main_card_item">
-                                  {e===0 && 
-                                    (
-                                      i.headImg ?
-                                      <img src={i.headImg} alt=""/>
-                                      :
-                                      <DefaultImg name="GitLink" title={i.name} />
-                                    )
-                                  }
-                                  <div style={{flex:1,width:0}}>
-                                    <Link to={`/information/${deptId}/newdetail/${j.id}`} className={`sub_name ${e===0? "":"sub_i"}`}>{j.name}</Link>
-                                    <p className={`sub_desc ${e===0? "task-hide-2":"task-hide"}`}>
-                                    {j.summary}
-                                    </p>
-                                    <div className="sub_info">
-                                      <span><img src={shijian} alt="" />{j.publishTime}</span>
-                                      <span><img src={liulan} alt="" />{j.visits}</span>
+                            i.cmsDocList && i.cmsDocList.length>0 ?
+                            <React.Fragment> 
+                              {i.cmsDocList.map((j,e)=>{
+                                return(
+                                  <div className="main_card_item">
+                                    {e===0 && 
+                                      (
+                                        j.headImg ?
+                                        <img src={j.headImg} alt=""/>
+                                        :
+                                        <DefaultImg name="GitLink" title={i.name} />
+                                      )
+                                    }
+                                    <div style={{flex:1,width:0}}>
+                                      <Link to={`/information/${deptId}/newdetail/${j.id}`} className={`sub_name task-hide ${e===0? "":"sub_i"}`}>{j.name}</Link>
+                                      <p className={`sub_desc ${e===0? "task-hide-2":"task-hide"}`}>
+                                      {j.summary}
+                                      </p>
+                                      <div className="sub_info">
+                                        <span><img src={shijian} alt="" />{j.publishTime}</span>
+                                        <span><img src={liulan} alt="" />{j.visits}</span>
+                                      </div>
                                     </div>
                                   </div>
-                                </div>
-                              )
-                            })
+                                )
+                              })
+                            }
+                            <div id={`main_card_item_${k+2}`} style={{opacity:"0"}}></div>
+                            </React.Fragment>
                             :
                             <div style={{display:"flex",justifyContent:"center",alignItems:"center",flexDirection:"column",height:300}}>
                               <img src={emptydata} alt="" width="230"/>
                               <p className="font-15 color-grey-6 mt20">暂无数据~</p>
+                              <div id={`main_card_item_${k+2}`} style={{opacity:"0"}}></div>
                             </div>
                           }
                         </div>
diff --git a/src/forge/Information/Pages/newsList.jsx b/src/forge/Information/Pages/newsList.jsx
index 665132758..4b66991f1 100644
--- a/src/forge/Information/Pages/newsList.jsx
+++ b/src/forge/Information/Pages/newsList.jsx
@@ -1,7 +1,7 @@
 import React , { useEffect , useState } from 'react';
 import PublicBanner from '../Component/publicBanner';
 import { Box , LongWidth  } from '../../Component/layout';
-import { Menu , Breadcrumb , Pagination , Spin } from 'antd';
+import { Menu , Breadcrumb , Pagination , Spin , Tooltip } from 'antd';
 import Hot from '../Component/hot';
 import axios from 'axios';
 import shijian from '../img/shijian.png';
@@ -21,12 +21,15 @@ function NewsList(props){
   const [ details , setDetails ] = useState(undefined);
   const [ menuSpin , setMenuSpin ] = useState(true);
 
+
   useEffect(()=>{
     if(deptId && cateId){
       getMainList();
     }
   },[deptId,cateId,pageNum])
 
+
+
   useEffect(()=>{
     if(deptId && cateId){
       setMenuSpin(true);
@@ -66,6 +69,7 @@ function NewsList(props){
     }).then(result=>{
       if(result){
         setMainList(result.data.rows);
+        setTotal(result.data.total);
       }
     }).catch(error=>{})
   }
@@ -101,7 +105,7 @@ function NewsList(props){
                   {
                     columnList.map((i,k)=>{
                       return(
-                        <Menu.Item key={i.id} value={i.id} ><Link to={`/information/${deptId}/news/${i.id}`}>{i.name}</Link></Menu.Item>
+                        <Menu.Item key={i.id} value={i.id} ><Tooltip placement={'left'} title={i.name}><Link className="task-hide" onClick={()=>{if(document.documentElement.scrollTop > 600)window.scrollTo(0,480);}} to={`/information/${deptId}/news/${i.id}`} title={i.name}>{i.name}</Link></Tooltip></Menu.Item>
                       )
                     })
                   }
@@ -144,7 +148,7 @@ function NewsList(props){
                 }
                 {
                   total > pageSize &&
-                  <div style={{padding:"0px 25px"}}>
+                  <div style={{padding:"25px 0px"}}>
                     <Pagination current={pageNum} pageSize={pageSize} total={total} showQuickJumper onChange={p=>{setPageNum(p)}}/>
                   </div>
                 }
diff --git a/src/forge/Information/Pages/projectSource.jsx b/src/forge/Information/Pages/projectSource.jsx
index 8bd1edd63..f8dadea28 100644
--- a/src/forge/Information/Pages/projectSource.jsx
+++ b/src/forge/Information/Pages/projectSource.jsx
@@ -67,6 +67,13 @@ function ProjectSource(props){
       <Menu.Item>点赞数量排序</Menu.Item>
     </Menu>
   )
+
+  function changeValue(e){
+    if(!e.target.value && e.target.value !==value){
+      setSearchName(e.target.value);
+    }
+    setValue(e.target.value);
+  }
   return(
     <div className="in_pro">
       {/* <Banner {...props}/> */}
@@ -74,7 +81,7 @@ function ProjectSource(props){
         <p className="in_title">开源项目</p>
         <Box>
           <ul className="in_pro_menu">
-            <li className="u_t">项目分类</li>
+            <li className="u_t"><i className="iconfont icon-muluicon font-15 mr10 mt2" style={{color:"#1f2329"}} />项目分类</li>
             <li className={0 === typeId ? "active":""} onClick={()=>setTypeId(0)}>全部分类</li>
             {
               typeList && typeList.length>0 &&
@@ -90,8 +97,8 @@ function ProjectSource(props){
               <div className="in_list_menu">
                 <Search 
                   value={value}
-                  onChange={(e)=>setValue(e.target.value)}
-                  onSearch={()=>setSearchName(value)}
+                  onChange={changeValue}
+                  onSearch={()=>{setSearchName(value)}}
                   allowClear={true}
                   size={'large'} 
                   placeholder="请输入项目名称" 
@@ -112,7 +119,7 @@ function ProjectSource(props){
                             {i.projectProperties && <img src={i.projectProperties.authorImageUrl} alt="" className="author_img"/> }
                             <div style={{flex:"1"}}>
                               <p className="in_b_main">
-                                <a onClick={()=>window.open(i.projectURL)}>{i.projectProperties && i.projectProperties.fullName}</a>
+                                <a onClick={()=>window.open(i.projectURL)}>{i.projectProperties && i.projectProperties.name}</a>
                                 {
                                   i.projectProperties && 
                                   <ul>
diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx
index 39c505b86..1048f1d04 100644
--- a/src/forge/Information/Pages/zoneVIP.jsx
+++ b/src/forge/Information/Pages/zoneVIP.jsx
@@ -1,5 +1,6 @@
 import React , { useState , useEffect } from 'react';
 import Crown from '../img/crown.png';
+import Nodata from '../../Nodata';
 import { Spin } from 'antd';
 import axios from 'axios';
 
@@ -68,6 +69,12 @@ function ZoneVIP(props){
             }
           </div>
         }
+        {
+          vipLists && vipLists.length === 0 &&
+          <div style={{marginTop:30,backgroundColor:"#fff",padding:"20px"}}>
+            <Nodata _html={"暂无数据"}/>
+          </div>
+        }
         </div>
       </Spin>
     </div>
diff --git a/src/forge/Information/img/menu6.png b/src/forge/Information/img/menu6.png
index b9834a3e1a3ce15c2755a1c018d60e6f28bb17ca..6f9a9b6c43549f93c76acb1a7f2b839a93a65542 100644
GIT binary patch
literal 5521
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
TUz4Ox00000NkvXXu0mjf7frV>

literal 4824
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

diff --git a/src/forge/Information/img/menu7.png b/src/forge/Information/img/menu7.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e265a0c190a7b9038d374abab946760a5223543
GIT binary patch
literal 3136
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
aIsXrAV3J+)?9h(@0000<MNUMnLSTYt)81kL

literal 0
HcmV?d00001

diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index 8a2c50902..45bbec818 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -45,7 +45,7 @@ function Index(props){
   useEffect(()=>{
     axios.interceptors.request.use(
       config => {
-        var localproxy = "https://testgetway.gitlink.org.cn";
+        var localproxy = "https://testgetway.trustie.net";
         var proxy = "";
         let url = "/api" +config.url;
         if(isDev){
@@ -84,7 +84,9 @@ function Index(props){
     const url = `/zone/open/${deptId}`;
     axios.get(url).then(result=>{
       if(result){
-        setData(result.data.data);
+        let data = result.data.data;
+        setData(data);
+        document.title= data&& data.name;
       }
     }).catch(console.error())
   }
diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss
index f81dbeed7..9baf42b53 100644
--- a/src/forge/Information/index.scss
+++ b/src/forge/Information/index.scss
@@ -20,10 +20,10 @@
     text-align:center;
   }
   .in_banner{
-    background-image: url(./img/mainbanner.png);
+    // background-image: url(./img/mainbanner.png);
     background-size: 100% 100%;
     // background-color:linear-gradient(270deg,#262a35 0%,rgba(38, 42, 53, 0.26) 42.94%,#262a35 100%);
-    height: 600px;
+    height: 450px;
     position: relative;
     padding-bottom: 88px;
     &>div{
@@ -37,7 +37,6 @@
         color:#78d0f5;
         font-size:40px;
         line-height: 40px;
-        height: 40px;
       }
       .sub_t{
         margin-top: 35px;
@@ -73,7 +72,7 @@
           &.ant-menu-item-selected a,a{
             color: #fff!important;
           }
-          &.ant-menu-item-selected::after{
+          &.ant-menu-item-selected::after, &.ant-menu-item-active::after{
             content:"";
             position: absolute;
             width: 100%;
@@ -82,6 +81,9 @@
             bottom: 1px;
             background-color: #466aff;
           }
+          &.ant-menu-item-active::after{
+            background-color:rgba(255, 255, 255, 0.36);
+          }
         }
       }
     }
@@ -217,6 +219,7 @@
         position: relative;
         display: block;
         line-height: 25px;
+        word-break: break-all;
         &.sub_i{
           padding-left: 18px;
           &::before{
@@ -239,7 +242,7 @@
     align-items: center;
     border-bottom: 1px dashed rgba(70, 106, 255, 0.48);
     margin-bottom: 5px;
-    span{
+    &>span{
       display: block;
       width: 113px;
       height: 30px;
@@ -249,6 +252,10 @@
       font-size:17px;
       background-image: url(./img/guide.png);
       background-size: 100% 100%;
+      span{
+        display: block;
+        max-width: 100px;
+      }
     }
     a{
       color:#466aff;
@@ -342,6 +349,10 @@
   width: 1200px;
   margin:0px auto;
 }
+.flexCenter{
+  display: flex;
+  align-items: center;
+}
 .detail_news_all{
   .detail_banners{
     background-image: url(./img/subbanner.png);
@@ -420,7 +431,7 @@
         .author_img{
           width: 66px;
           height: 66px;
-          border-radius: 10px;
+          border-radius: 50%;
           margin-right: 20px;
           object-fit: cover;
         }
@@ -530,6 +541,8 @@
         font-size:18px;
         font-weight:500;
         cursor: default;
+        display: flex;
+        align-items: center;
       }
       &.active{
         color:#466aff;
@@ -555,12 +568,13 @@
     display: flex;
     align-items: center;
     margin-top: 54px;
+    padding:27px 24px;
     &>img{
-      border-radius: 0px 4px 4px 0px;
+      border-radius: 4px;
       object-fit: cover;
     }
     .zone_infos_desc{
-      padding:0px 34px;
+      padding:0px 34px 0px 10px;
       flex: 1;
       .z_name{
         color:#1f2329;
@@ -573,6 +587,8 @@
         color:#3d485d;
         font-size:14px;
         line-height:32px;
+        word-break: break-all;
+        -webkit-line-clamp: 4;
       }
     }
   }
@@ -590,6 +606,9 @@
       font-size:17px;
       height: 24px;
       line-height: 24px;
+      &:hover{
+        color: #466aff;
+      }
     }
     .zone_n_desc{
       color:#4c5876;
@@ -606,6 +625,23 @@
       line-height: 20px;
       margin-top: 15px;
     }
+    .zone_btn{
+      padding-right: 20px;
+      position: relative;
+      height: 20px;
+      line-height: 20px;
+      img{
+        position: absolute;
+        left: 62px;
+        top:5px;
+        transition: 0.1s;
+      }
+      &:hover{
+        img{
+          left: 68px;
+        }
+      }
+    }
     .zone_new_first{
       background-color: #fff;
       padding:30px;
@@ -616,12 +652,21 @@
       margin-left: 30px;
       display: flex;
       flex-direction: column;
-      justify-content: space-between;
+      &.spaceeTween{
+        justify-content: space-between;
+      }
+      &.flexStart{
+        justify-content: flex-start;
+        li{
+          margin-bottom: 30px!important;
+        }
+      }
       li{
         background-color: #fff;
         width: 385px;
         padding:20px;
         border-radius: 4px;
+        margin-bottom: 30px;
         &:last-child{
           margin-bottom: 0px;
         }
@@ -649,13 +694,19 @@
         &:nth-child(2n){
           margin-right: 0px!important;
         }
-        &>img{
+        .imgBox{
+          background-color: #E3E7F3;
+          border-radius: 8px;
           width: 75px;
           height: 75px;
-          border-radius: 8px;
           margin-right: 14px;
+          img{
+            width: 75px;
+            height: 75px;
+            border-radius: 8px;
+          }
         }
-        &>div{
+        .infoBox{
           flex:1;
           .z_p_title{
             font-weight:700;
@@ -665,6 +716,9 @@
             height: 22px;
             line-height: 22px;
             display: block;
+            &:hover{
+              color: #466aff;
+            }
           }
           .z_p_desc{
             color:#4c5876;
@@ -687,11 +741,12 @@
       display: flex;
       align-items: center;
       margin-top: 50px;
-      justify-content: space-between;
       flex-wrap: wrap;
       li{
         padding:17px 13px;
         background-image: url(./img/contributebg.png);
+        box-shadow:0px 0px 15px rgba(49,61,113,0.06);
+        background-size: 100% 100%;
         width: 268px;
         height: 268px;
         border:1px solid #fff;
@@ -699,6 +754,10 @@
         flex-direction: column;
         align-items: center;
         margin-bottom: 30px!important;
+        margin-right: 40px;
+        &:nth-child(4n){
+          margin-right: 0px;
+        }
         &>img{
           width: 80px;
           height: 80px;
@@ -776,16 +835,16 @@
       padding:0px 40px 10px;
       margin:35px 0px 15px;
       &:nth-child(4n+1) .card_title{
-        background-color: #466aff;
+        background-color: rgba(72, 91, 170, 1);
       }
       &:nth-child(4n+2) .card_title{
-        background-color: #07a583;
+        background-color: rgba(54, 141, 122, 1);
       }
       &:nth-child(4n+3) .card_title{
-        background-color: #8257e8;
+        background-color: rgba(120, 95, 181, 1);
       }
       &:nth-child(4n+4) .card_title{
-        background-color: #cb7e4b;
+        background-color: rgba(168, 128, 101, 1);
       }
       .card_title{
         height: 49px;
@@ -822,7 +881,7 @@
           &>img{
             width: 100px;
             height: 100px;
-            border-radius: 10px;
+            border-radius: 50%;
             margin-right: 24px;
           }
           .card_u_info{