From 4f2dcb0f1c1531852108227cbb571438690acd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Fri, 5 Jun 2026 11:47:56 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2=E6=94=B9=E7=94=A8=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=BC=B9=E7=AA=97=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/Component/addProjects.jsx | 2 +- .../Pages/project/cateDetail/index.jsx | 35 ++++++++++++++++--- src/forge/Information/Pages/projectSource.jsx | 4 +-- src/forge/Information/index.jsx | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/forge/Information/Component/addProjects.jsx b/src/forge/Information/Component/addProjects.jsx index e7e78e1ce..6a701625c 100644 --- a/src/forge/Information/Component/addProjects.jsx +++ b/src/forge/Information/Component/addProjects.jsx @@ -110,7 +110,7 @@ function AddProjects({id,visible,typeList,needAudit,role,onCancel,onFresh}){ } const res = response.data; if(res && res.code === 200){ - message.success((needAudit === 1 && role && role.role !== "Manager") ? "操作成功，请等待管理员审核" : "操作成功!"); + message.success((needAudit === 1 && role !== "Manager") ? "操作成功，请等待管理员审核" : "操作成功!"); Init(page,searchValue); onFresh(); }else{ diff --git a/src/forge/Information/Pages/project/cateDetail/index.jsx b/src/forge/Information/Pages/project/cateDetail/index.jsx index 3fa5ac138..c86773a13 100644 --- a/src/forge/Information/Pages/project/cateDetail/index.jsx +++ b/src/forge/Information/Pages/project/cateDetail/index.jsx @@ -1,7 +1,7 @@ import React, { Fragment, useEffect, useRef, useState } from 'react'; import { Spin, Pagination, Divider, message, Input } from 'antd'; import { Link } from 'react-router-dom'; -import { getProjectsLists } from '../../../api'; +import { getProjectsLists, getGlobal } from '../../../api'; import { projectCateConfig } from '../projectCateConfig'; import nodata from '../../../img/nodata.png'; import { getUniqueIdentifier, getUserName, getBrowserPlatform, getBrowserBrand } from '../../../utils'; @@ -118,6 +118,32 @@ function ProjectCateDetail(props) { }, [visibleSections.coreArea, visibleSections.projectList]); function getLists() { + if(searchName){ + getGlobal({ + extraSearchParam: { + projectTypeId: cateId + }, + keyword: searchName || "", + pageNum: page, + pageSize: pageSize, + types: ["zone_project"], + zoneId: id + }).then(result => { + if (result && result.data) { + setLists(result.data.rows.map(item=>{ + return{ + ...item, + projectProperties: item.extendData + } + })); + setTotal(result.data.total); + setLoading(false); + } + }).catch(() => { + setLoading(false); + }); + return + } getProjectsLists(id, { pageNum: page, pageSize: pageSize, @@ -132,6 +158,7 @@ function ProjectCateDetail(props) { }).catch(() => { setLoading(false); }); + } return ( @@ -243,7 +270,7 @@ function ProjectCateDetail(props) { {lists.map((item, key) => (
- {item.projectProperties && item.projectProperties.authorImageUrl && } + {item.projectProperties && item.projectProperties.authorImageUrl && }
{item.projectProperties && item.projectProperties.fromOwner}/{item.projectProperties && item.projectProperties.name && item.projectProperties.name.split("/").pop()}
@@ -263,7 +290,7 @@ function ProjectCateDetail(props) { )}
- {item.projectType && {item.projectType}} + {item.projectType || name} {item.projectProperties && item.projectProperties.language && {item.projectProperties.language} @@ -271,7 +298,7 @@ function ProjectCateDetail(props) {
{item.projectProperties && item.projectProperties.timeAgo && 更新于{item.projectProperties.timeAgo}}
- 查看详情 + 查看详情
))}
diff --git a/src/forge/Information/Pages/projectSource.jsx b/src/forge/Information/Pages/projectSource.jsx index ecee74d89..44fab0e42 100644 --- a/src/forge/Information/Pages/projectSource.jsx +++ b/src/forge/Information/Pages/projectSource.jsx @@ -26,7 +26,7 @@ function ProjectSource(props){ const [ value , setValue ] = useState(undefined); const [ loading , setLoading ] = useState(false); const [ memberStatus , setMemberStatus] = useState(memberStatusEnum.notMember); - const { id, temp, sectionProjectTitle , role } = props; + const { id, temp, sectionProjectTitle , role, data } = props; useEffect(()=>{ let uuid = getUniqueIdentifier() @@ -104,7 +104,7 @@ function ProjectSource(props){ } return(
- setVisible(false)} role={role && role.role} onFresh={getLists}/> + setVisible(false)} role={role && role.role} onFresh={getLists}/>

{sectionProjectTitle}

diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 289fc5fa1..27e54f853 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -342,7 +342,7 @@ function Index(props){ ( - + )} > Date: Fri, 5 Jun 2026 14:38:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B6=85=E7=AE=97=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A0=8F=E7=9B=AE=E9=A1=B5=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/custom/newsIndex.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Information/Pages/custom/newsIndex.jsx b/src/forge/Information/Pages/custom/newsIndex.jsx index 8035d7427..50cab6f3b 100644 --- a/src/forge/Information/Pages/custom/newsIndex.jsx +++ b/src/forge/Information/Pages/custom/newsIndex.jsx @@ -130,11 +130,11 @@ function NewsIndex(props) { mainList && mainList.length > 0 &&
  • - 全部新闻 + {setPageNum(1)}}>全部新闻
    • {mainList.map((i, k) => { return
  • - + {setPageNum(1); setViewMode("default")}}> {i.name} From 68d4cfe75b692257da5b19cb2c8b089713f5d730 Mon Sep 17 00:00:00 2001 From: amypeng Date: Fri, 5 Jun 2026 17:19:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 积分流水 --- src/forge/Information/Pages/scoreDetail.jsx | 14 +++++++------- src/forge/Information/Pages/zoneUser.jsx | 4 ++-- src/forge/Information/api.js | 7 +++++++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/forge/Information/Pages/scoreDetail.jsx b/src/forge/Information/Pages/scoreDetail.jsx index 28bc0fb79..33a45ae79 100644 --- a/src/forge/Information/Pages/scoreDetail.jsx +++ b/src/forge/Information/Pages/scoreDetail.jsx @@ -1,7 +1,7 @@ import React , { useState , useEffect } from 'react'; import { Tag , Pagination } from 'antd'; -import { getMemberAccountDetail, getPointsAccountEvent } from '../api'; +import { getMemberAccountDetail, getPointsTransaction } from '../api'; import '../indexUser.scss'; @@ -18,7 +18,7 @@ const transactionTypeMap = { }; function getPointsShow(item) { - const config = transactionTypeMap[item.status]; + const config = transactionTypeMap[item.transactionType]; if (!config) { return { className: '', pointsTxt: item.score, statusClass: '', status: '' }; } @@ -45,7 +45,7 @@ function scoreDetail(props){ },[id, page]) function getDetail() { - getPointsAccountEvent(id, { pageNum: page, pageSize: limit }).then(res => { + getPointsTransaction(id, { pageNum: page, pageSize: limit }).then(res => { if (res && res.data && res.data.code === 200) { const processedRows = (res.data.rows || []).map(item => ({ ...item, @@ -78,18 +78,18 @@ function scoreDetail(props){ {list.map((item, index) => ( {item.createTime} - {item.subject}

    {item.subjectDesc}

    + {item.event?.subject}

    {item.subjectDesc}

    {item.pointsShow?.pointsTxt} {item.pointsShow?.status} - {item.reason} + {item.event?.reason} { - item.replyContent && + item.event?.replyContent &&
    - 管理员：{item.replyContent} + 管理员：{item.event?.replyContent}
    } diff --git a/src/forge/Information/Pages/zoneUser.jsx b/src/forge/Information/Pages/zoneUser.jsx index 05f40c501..2eed56926 100644 --- a/src/forge/Information/Pages/zoneUser.jsx +++ b/src/forge/Information/Pages/zoneUser.jsx @@ -380,10 +380,10 @@ function ZoneUser(props){ onCancel={()=>setDocVisible(false)} onSure={() => { setDocVisible(false); setSuccessVisible(true);getInfo();}} /> setAcitvityVisible(false)} onSure={() => { showNotification(msg); setAcitvityVisible(false); getInfo();}} + onCancel={()=>setAcitvityVisible(false)} onSure={(msg) => { showNotification(msg); setAcitvityVisible(false); getInfo();}} /> setQaVisible(false)} onSure={() => { showNotification(msg); setQaVisible(false); getInfo();}} + onCancel={()=>setQaVisible(false)} onSure={(msg) => { showNotification(msg); setQaVisible(false); getInfo();}} /> Date: Mon, 8 Jun 2026 09:56:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 后端接口调整 --- src/forge/Information/Pages/scoreDetail.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/Information/Pages/scoreDetail.jsx b/src/forge/Information/Pages/scoreDetail.jsx index 33a45ae79..9480291f9 100644 --- a/src/forge/Information/Pages/scoreDetail.jsx +++ b/src/forge/Information/Pages/scoreDetail.jsx @@ -78,18 +78,18 @@ function scoreDetail(props){ {list.map((item, index) => ( {item.createTime} - {item.event?.subject}

    {item.subjectDesc}

    + {item.subject}

    {item.subjectDesc}

    {item.pointsShow?.pointsTxt} {item.pointsShow?.status} - {item.event?.reason} + {item.reason} { - item.event?.replyContent && + item.replyContent &&
    - 管理员：{item.event?.replyContent} + 管理员：{item.replyContent}
    }