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();}} />