Commit 872dc05d authored by XieZhiXiong's avatar XieZhiXiong

chore: 去掉等级标签组件直接展示等级标签

parent ef4ea68d
import React from 'react';
import LevelBrand from '../LevelBrand';
import styles from './index.less';
export interface HeadInfoProps {
info: {
name?: string,
level?: number,
name?: string,
levelTag: string,
};
extra?: React.ReactNode;
};
......@@ -19,7 +18,7 @@ const HeadInfo: React.FC<HeadInfoProps> = ({ info, extra }) => (
{info.name || ''}
</div>
{!extra ? (
<LevelBrand level={info.level} />
info.levelTag
) : extra}
</div>
);
......
......@@ -130,7 +130,7 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
......@@ -85,7 +85,7 @@ const Frozen: React.FC<{}> = () => {
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
......@@ -38,10 +38,8 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { coverColFiltersItem } from '../utils';
import StatusTag from '../components/StatusTag';
import LevelBrand from '../components/LevelBrand';
import { getMemberMaintenancePage, getMemberMaintenancePageitems, postMemberMaintenanceDelete } from '@/services/MemberV2Api';
import { getMemberMaintenancePage, getMemberMaintenancePageitems, postMemberMaintenanceDelete, GetMemberMaintenancePageResponseDetail } from '@/services/MemberV2Api';
const formActions = createFormActions();
......@@ -84,7 +82,7 @@ const memberMaintain: React.FC<[]> = () => {
});
};
const defaultColumns: ColumnType<any>[] = [
const defaultColumns: ColumnType<GetMemberMaintenancePageResponseDetail>[] = [
{
title: 'ID',
dataIndex: 'memberId',
......@@ -96,7 +94,7 @@ const memberMaintain: React.FC<[]> = () => {
dataIndex: 'name',
align: 'center',
key: 'name',
render: (text: any, record: any) => (
render: (text: any, record) => (
<>
<EyePreview
url={`/memberManage/manage/maintian/detail/basicInfo?id=${record.memberId}&validateId=${record.validateId}`}
......@@ -104,11 +102,7 @@ const memberMaintain: React.FC<[]> = () => {
{text}
</EyePreview>
<div>
{record.level !== undefined ? (
<LevelBrand level={record.level} />
) : (
record.levelTag
)}
{record.levelTag}
</div>
</>
),
......
......@@ -270,7 +270,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
import React, { useState, useEffect, useRef } from 'react';
import React, { useState, useRef } from 'react';
import { history } from 'umi';
import { Card, Space, Button, Badge, Modal, message } from 'antd';
import { ClockCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
......@@ -17,10 +17,8 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { coverColFiltersItem } from '../utils';
import StatusTag from '../components/StatusTag';
import LevelBrand from '../components/LevelBrand';
import { getMemberValidateStep1Page, getMemberValidateStep1Pageitems, postMemberValidateStep1Batch } from '@/services/MemberV2Api';
import { getMemberValidateStep1Page, getMemberValidateStep1Pageitems, postMemberValidateStep1Batch, GetMemberValidateStep1PageResponseDetail } from '@/services/MemberV2Api';
const { confirm } = Modal;
......@@ -35,7 +33,7 @@ const MemberPr1: React.FC<{}> = props => {
history.push(`/memberManage/manage/memberPr1/verify?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
const defaultColumns: ColumnType<GetMemberValidateStep1PageResponseDetail>[] = [
{
title: 'ID',
dataIndex: 'memberId',
......@@ -45,7 +43,7 @@ const MemberPr1: React.FC<{}> = props => {
title: '会员名称',
dataIndex: 'name',
align: 'center',
render: (text: any, record: any) => (
render: (text: any, record) => (
<>
<EyePreview
url={`/memberManage/manage/memberPr1/detail?id=${record.memberId}&validateId=${record.validateId}`}
......@@ -53,7 +51,7 @@ const MemberPr1: React.FC<{}> = props => {
{text}
</EyePreview>
<div>
<LevelBrand level={record.level} />
{record.levelTag}
</div>
</>
),
......
......@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
import React, { useState, useEffect, useRef } from 'react';
import React, { useState, useRef } from 'react';
import { history } from 'umi';
import { Card, Space, Button, Badge, Modal, message } from 'antd';
import { ClockCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
......@@ -17,10 +17,8 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { coverColFiltersItem } from '../utils';
import StatusTag from '../components/StatusTag';
import LevelBrand from '../components/LevelBrand';
import { getMemberValidateStep2Page, getMemberValidateStep2Pageitems, postMemberValidateStep2Batch } from '@/services/MemberV2Api';
import { getMemberValidateStep2Page, getMemberValidateStep2Pageitems, postMemberValidateStep2Batch, GetMemberValidateStep2PageResponseDetail } from '@/services/MemberV2Api';
const { confirm } = Modal;
......@@ -35,7 +33,7 @@ const MemberPr2: React.FC<{}> = props => {
history.push(`/memberManage/manage/memberPr2/verify?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
const defaultColumns: ColumnType<GetMemberValidateStep2PageResponseDetail>[] = [
{
title: 'ID',
dataIndex: 'memberId',
......@@ -53,7 +51,7 @@ const MemberPr2: React.FC<{}> = props => {
{text}
</EyePreview>
<div>
<LevelBrand level={record.level} />
{record.levelTag}
</div>
</>
),
......
......@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
......@@ -18,10 +18,8 @@ import {
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { coverColFiltersItem } from '../utils';
import StatusTag from '../components/StatusTag';
import LevelBrand from '../components/LevelBrand';
import { getMemberValidateConfirmPage, getMemberValidateConfirmPageitems, postMemberValidateConfirmBatch } from '@/services/MemberV2Api';
import { getMemberValidateConfirmPage, getMemberValidateConfirmPageitems, postMemberValidateConfirmBatch, GetMemberValidateConfirmPageResponseDetail } from '@/services/MemberV2Api';
const { confirm } = Modal;
......@@ -36,7 +34,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
history.push(`/memberManage/manage/memberPrConfirm/verify?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
const defaultColumns: ColumnType<GetMemberValidateConfirmPageResponseDetail>[] = [
{
title: 'ID',
dataIndex: 'memberId',
......@@ -46,7 +44,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
title: '会员名称',
dataIndex: 'name',
align: 'center',
render: (text: any, record: any) => (
render: (text: any, record) => (
<>
<EyePreview
url={`/memberManage/manage/memberPrConfirm/detail?id=${record.memberId}&validateId=${record.validateId}`}
......@@ -54,7 +52,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
{text}
</EyePreview>
<div>
<LevelBrand level={record.level} />
{record.levelTag}
</div>
</>
),
......
......@@ -304,7 +304,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<HeadInfo
info={{
name: basicInfo?.name,
level: 1,
levelTag: basicInfo?.levelTag!,
}}
/>
}
......
......@@ -18,8 +18,7 @@ import {
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import StatusTag from '../components/StatusTag';
import LevelBrand from '../components/LevelBrand';
import { getMemberValidateCommitPage, getMemberValidateCommitPageitems, postMemberValidateCommitBatch } from '@/services/MemberV2Api';
import { getMemberValidateCommitPage, getMemberValidateCommitPageitems, postMemberValidateCommitBatch, GetMemberValidateCommitPageResponseDetail } from '@/services/MemberV2Api';
const { confirm } = Modal;
......@@ -34,7 +33,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
history.push(`/memberManage/manage/memberPrSubmit/verify?id=${record.memberId}&validateId=${record.validateId}`);
};
const defaultColumns: ColumnType<any>[] = [
const defaultColumns: ColumnType<GetMemberValidateCommitPageResponseDetail>[] = [
{
title: 'ID',
dataIndex: 'memberId',
......@@ -44,7 +43,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
title: '会员名称',
dataIndex: 'name',
align: 'center',
render: (text: any, record: any) => (
render: (text: any, record) => (
<>
<EyePreview
url={`/memberManage/manage/memberPrSubmit/detail?id=${record.memberId}&validateId=${record.validateId}`}
......@@ -52,7 +51,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
{text}
</EyePreview>
<div>
<LevelBrand level={record.level} />
{record.levelTag}
</div>
</>
),
......
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