Commit b87a98da authored by XieZhiXiong's avatar XieZhiXiong

fix:修复笑脸显示不对的问题、删除会员状态检索

parent 4c9d782a
...@@ -157,7 +157,7 @@ const EvaluationList = props => { ...@@ -157,7 +157,7 @@ const EvaluationList = props => {
</Col> </Col>
<Col span={4}> <Col span={4}>
<div style={{ textAlign: 'right' }}> <div style={{ textAlign: 'right' }}>
<SmilingFace value={2} /> <SmilingFace value={item.smile} />
</div> </div>
</Col> </Col>
</Row> </Row>
......
...@@ -9,7 +9,7 @@ import styles from './index.less'; ...@@ -9,7 +9,7 @@ import styles from './index.less';
const formActions = createFormActions(); const formActions = createFormActions();
const PAGE_SIZE = 2; const PAGE_SIZE = 8;
export interface Search { export interface Search {
/** /**
...@@ -19,15 +19,15 @@ export interface Search { ...@@ -19,15 +19,15 @@ export interface Search {
/** /**
* 交易时间开始 * 交易时间开始
*/ */
// dealTimeStart: string | null dealTimeStart: string | null
/** /**
* 交易时间结束 * 交易时间结束
*/ */
// dealTimeEnd: string | null dealTimeEnd: string | null
/** /**
* 评价方名称 * 评价方名称
*/ */
// memberName: string | null memberName: string | null
}; };
export interface ListParams extends Search { export interface ListParams extends Search {
...@@ -198,7 +198,7 @@ export default class RecordList extends React.Component<RecordListProps, RecordL ...@@ -198,7 +198,7 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
if (!hasMore || loading) { if (!hasMore || loading) {
return; return;
} }
this.setState((prevState) => ({ this.setState((prevState: any) => ({
size: prevState.size + 1, size: prevState.size + 1,
})); }));
this.getRecordList().then(res => { this.getRecordList().then(res => {
......
...@@ -81,8 +81,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -81,8 +81,6 @@ const MemberPr1: React.FC<{}> = props => {
title: '会员状态', title: '会员状态',
dataIndex: 'statusName', dataIndex: 'statusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.status === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} /> <StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} />
), ),
...@@ -187,13 +185,6 @@ const MemberPr1: React.FC<{}> = props => { ...@@ -187,13 +185,6 @@ const MemberPr1: React.FC<{}> = props => {
const newColumns = columns.slice(); const newColumns = columns.slice();
// filter 0 过滤掉全部选项
coverColFiltersItem(
newColumns,
'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
return { return {
......
...@@ -81,8 +81,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -81,8 +81,6 @@ const MemberPr2: React.FC<{}> = props => {
title: '会员状态', title: '会员状态',
dataIndex: 'statusName', dataIndex: 'statusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.status === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} /> <StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} />
), ),
...@@ -187,13 +185,6 @@ const MemberPr2: React.FC<{}> = props => { ...@@ -187,13 +185,6 @@ const MemberPr2: React.FC<{}> = props => {
const newColumns = columns.slice(); const newColumns = columns.slice();
// filter 0 过滤掉全部选项
coverColFiltersItem(
newColumns,
'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
return { return {
......
...@@ -82,8 +82,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -82,8 +82,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
title: '会员状态', title: '会员状态',
dataIndex: 'statusName', dataIndex: 'statusName',
align: 'center', align: 'center',
filters: [],
onFilter: (value, record) => record.status === value,
render: (text, record) => ( render: (text, record) => (
<StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} /> <StatusTag type={MEMBER_STATUS_TAG_MAP[record.status]} title={text} />
), ),
...@@ -193,13 +191,6 @@ const MemberPrConfirm: React.FC<{}> = props => { ...@@ -193,13 +191,6 @@ const MemberPrConfirm: React.FC<{}> = props => {
const newColumns = columns.slice(); const newColumns = columns.slice();
// filter 0 过滤掉全部选项
coverColFiltersItem(
newColumns,
'statusName',
status.map(item => ({ text: item.text, value: item.id })).filter(item => item.value !== 0),
);
setColumns(newColumns); setColumns(newColumns);
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment