From 2e323d229c9c579c91283c37c0374a069680b7cd Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 29 Oct 2025 14:19:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=82=E4=B8=8E=E9=A1=B9=E7=9B=AE=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Infos.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 7e60cd5a6..33561f322 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -79,7 +79,8 @@ class Infos extends Component { route_type: undefined, undo_events:0, menuKey:"6", - avatarVisible:false + avatarVisible:false, + user_project_count:0 }; } @@ -387,7 +388,12 @@ class Infos extends Component { } this.chooseTab("0")}>活动概览 数据统计 - 参与项目 + + + 参与项目 + { user && user.user_projects_count > 0 ? ({user.user_projects_count}) :"" } + + { current_user && user && user.login === current_user.login ? From 7df2481f8d00e4b606bd25222969c0efcb6b1b0e Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 30 Oct 2025 16:15:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B3=9B=E5=9C=A8=E4=B8=93=E5=8C=BA-?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/Component/memberList.jsx | 46 ++++++++++++++++--- .../Information/Component/publicBanner.jsx | 2 +- src/forge/Information/Pages/zoneVIP.jsx | 2 +- src/forge/Information/index.scss | 35 ++++++++++++-- 4 files changed, 74 insertions(+), 11 deletions(-) diff --git a/src/forge/Information/Component/memberList.jsx b/src/forge/Information/Component/memberList.jsx index 67faf6af4..52fbb50b6 100644 --- a/src/forge/Information/Component/memberList.jsx +++ b/src/forge/Information/Component/memberList.jsx @@ -1,17 +1,39 @@ -import React from 'react'; +import React,{useCallback, useEffect,useState} from 'react'; import { Link } from 'react-router-dom'; import { tempEnum } from '../tempInfo'; import Crown from '../img/crown.png'; import Nodata from '../../Nodata'; import nodata from '../img/nodata.png'; +import { Input } from 'antd'; +const { Search } = Input; function Member(props) { - const { vipLists, temp } = props; + const { vipLists, temp , deptId } = props; + const isUOS = deptId === "uos";//id===91:泛在的开发社区成员,定制 + const [ list , setList ] = useState(vipLists); + + useEffect(()=>{ + if(vipLists && vipLists.length > 0 ){ + const ele = vipLists.map((i=>{ + return isUOS && i.id===91 ? {...i,isSearch:i.zoneMemberList.length>0}:{...i} + })) + setList(ele); + } + },[vipLists]) + + function searchFunc(e,index){ + let zonelist = vipLists[index].zoneMemberList; + let member = e ? zonelist.filter(i=>i.name.indexOf(e)>-1) : zonelist; + const ele = list.map((i,k)=>{ + return k === index ? {...i,zoneMemberList:member} :{...i} + }) + setList(ele); + } return(
{ - vipLists.map((i,k)=>{ + list.map((i,k)=>{ return(
@@ -23,16 +45,28 @@ function Member(props) { { temp === tempEnum.zone1 &&
{i.typeName}
}
-

{i.typeIntroduction}

+
+

{i.typeIntroduction}

+
+ {i.isSearch && + searchFunc(e,k)} + allowClear={true} + className='uosSearch' + placeholder='请输入单位名称搜索' + style={{width:"300px",height:"36px",marginTop:"20px"}} + suffix={} + /> + } { i.zoneMemberList && i.zoneMemberList.length > 0 ? -
    +
      { i.zoneMemberList.map((j,key)=>{ return(
    • - + { !(isUOS && i.id === 91) && }
      {j.name}{j.memberLevel && {j.memberLevel} }

      {j.introduction}

      diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx index 21e24df4a..3d5484395 100644 --- a/src/forge/Information/Component/publicBanner.jsx +++ b/src/forge/Information/Component/publicBanner.jsx @@ -115,7 +115,7 @@ function PublicBanner(props) {

      } -

      +

      {isNSCC && } diff --git a/src/forge/Information/Pages/zoneVIP.jsx b/src/forge/Information/Pages/zoneVIP.jsx index bb20c6cc8..ff3c968ab 100644 --- a/src/forge/Information/Pages/zoneVIP.jsx +++ b/src/forge/Information/Pages/zoneVIP.jsx @@ -96,7 +96,7 @@ function ZoneVIP(props){
      { - vipLists && (vipLists.length > 0 ? :
      + vipLists && (vipLists.length > 0 ? :
      { temp === tempEnum.zone1 ? : } diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 385f1c1c9..0dc4c9230 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -158,7 +158,7 @@ } .main_t_uos{ width: fit-content; - font-size:40px; + font-size:44px; display: flex; align-items: center; font-family: jinbuti; @@ -169,8 +169,8 @@ margin-left: 18px; } img { - width: 40px; - height: 40px; + width: 65px; + height: 65px; } } .sub_t{ @@ -1218,10 +1218,30 @@ line-height:32px; word-break: break-all; margin-top: 32px; + &.seachCardDesc{ + position: relative; + .ant-input-search{ + position: absolute; + right: 0px; + bottom: -15px; + } + } } .card_ul{ margin-top: 15px; padding-bottom: 10px; + &.doubleUl{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + margin-top: 0px; + .card_u_li{ + width: 49%; + &:last-child .card_u_wrap{ + border-bottom: 1px dashed rgba(141, 149, 172,0.27); + } + } + } .card_u_li{ &:last-child .card_u_wrap{ border-bottom: none; @@ -1264,6 +1284,7 @@ background-color:rgba(70, 106, 255, 0.13); border-radius:2px; min-width: 76px; + padding:0px 10px; text-align: center; line-height: 26px; color:#466aff; @@ -2028,6 +2049,14 @@ } } } +.uosSearch{ + .ant-input-suffix{ + background-color: unset; + .anticon{ + display: none; + } + } +} .NSCC_source_box{ background-image: url('./img/source-bg.png'); background-size: 100% 100%;