Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
37ba3d93
Commit
37ba3d93
authored
Apr 01, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 去掉等级标签组件直接展示等级标签
parent
8f3390eb
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
14 additions
and
26 deletions
+14
-26
index.tsx
src/pages/member/components/MemberProfile/index.tsx
+1
-2
index.tsx
src/pages/member/memberAssigned/index.tsx
+3
-3
index.tsx
src/pages/member/memberMaintain/black/index.tsx
+1
-2
index.tsx
src/pages/member/memberMaintain/detailed/index.tsx
+1
-2
index.tsx
src/pages/member/memberMaintain/eliminate/index.tsx
+1
-2
index.tsx
src/pages/member/memberMaintain/freeze/index.tsx
+1
-2
index.tsx
src/pages/member/memberMaintain/index.tsx
+3
-5
index.tsx
src/pages/member/memberMaintain/unfreeze/index.tsx
+1
-2
index.tsx
src/pages/member/memberQuery/detailed/index.tsx
+1
-3
index.tsx
src/pages/member/memberQuery/index.tsx
+1
-3
No files found.
src/pages/member/components/MemberProfile/index.tsx
View file @
37ba3d93
...
...
@@ -19,7 +19,6 @@ import {
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
AuditProcess
from
'@/components/AuditProcess'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
FlowRecords
from
'@/components/FlowRecords'
;
import
CustomizeColumn
from
'@/components/CustomizeColumn'
;
import
{
DetailType
,
AreaCodeType
}
from
'./interface'
;
...
...
@@ -217,7 +216,7 @@ const MemberProfile: React.FC<IProps> = (props) => {
name
:
dataSource
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
dataSource
?.
level
}
/>
dataSource
?.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberAssigned/index.tsx
View file @
37ba3d93
...
...
@@ -12,12 +12,12 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
getMemberAbilityAssignedPage
,
getMemberAbilityAssignedPageitems
,
postMemberAbilityAssignedBind
,
GetMemberAbilityAssignedPageResponseDetail
,
}
from
'@/services/MemberV2Api'
;
import
useSpliceArray
from
'@/hooks/useSpliceArray'
;
import
{
querySchema
}
from
'./schema2'
;
...
...
@@ -59,7 +59,7 @@ const MemberMaintain: React.FC<[]> = () => {
const
intl
=
useIntl
();
const
{
confirm
}
=
Modal
;
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
const
defaultColumns
:
ColumnType
<
GetMemberAbilityAssignedPageResponseDetail
>
[]
=
[
{
title
:
`
${
intl
.
formatMessage
({
id
:
'member.management.maintain.query.memberId'
,
...
...
@@ -131,7 +131,7 @@ const MemberMaintain: React.FC<[]> = () => {
id
:
'member.management.maintain.query.level'
,
}),
dataIndex
:
'level'
,
render
:
text
=>
<
LevelBrand
level=
{
text
}
/>
,
render
:
(
_
,
record
)
=>
record
.
levelTag
,
},
{
title
:
intl
.
formatMessage
({
...
...
src/pages/member/memberMaintain/black/index.tsx
View file @
37ba3d93
...
...
@@ -33,7 +33,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
FlowRecords
from
'@/components/FlowRecords'
;
import
CustomizeColumn
from
'@/components/CustomizeColumn'
;
import
NiceForm
from
'@/components/NiceForm'
;
...
...
@@ -145,7 +144,7 @@ const MemberMaintainBlack: React.FC<{}> = () => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
2
}
/>
memberInfo
?.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberMaintain/detailed/index.tsx
View file @
37ba3d93
...
...
@@ -26,7 +26,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
Bookmark
from
'../../components/Bookmark'
;
interface
QueryProps
{
...
...
@@ -249,7 +248,7 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
memberInfo
?.
level
}
/>
memberInfo
?.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberMaintain/eliminate/index.tsx
View file @
37ba3d93
...
...
@@ -29,7 +29,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
FlowRecords
from
'@/components/FlowRecords'
;
import
CustomizeColumn
from
'@/components/CustomizeColumn'
;
import
NiceForm
from
'@/components/NiceForm'
;
...
...
@@ -141,7 +140,7 @@ const MemberMaintainEliminate: React.FC<{}> = () => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
2
}
/>
memberInfo
?.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberMaintain/freeze/index.tsx
View file @
37ba3d93
...
...
@@ -27,7 +27,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
FlowRecords
from
'@/components/FlowRecords'
;
import
CustomizeColumn
from
'@/components/CustomizeColumn'
;
import
NiceForm
from
'@/components/NiceForm'
;
...
...
@@ -137,7 +136,7 @@ const MemberFrozen: React.FC<{}> = () => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
2
}
/>
memberInfo
.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberMaintain/index.tsx
View file @
37ba3d93
...
...
@@ -14,13 +14,11 @@ import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
EyePreview
from
'@/components/EyePreview'
;
import
NiceForm
from
'@/components/NiceForm'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
getMemberAbilityMaintenancePage
,
getMemberAbilityMaintenancePageitems
}
from
'@/services/MemberV2Api'
;
import
{
getMemberAbilityMaintenancePage
,
getMemberAbilityMaintenancePageitems
,
GetMemberAbilityMaintenancePageResponseDetail
}
from
'@/services/MemberV2Api'
;
import
useSpliceArray
from
'@/hooks/useSpliceArray'
;
import
{
querySchema
}
from
'./schema'
;
import
{
MEMBER_STATUS_TAG_MAP
,
MEMBER_INNER_STATUS_BADGE_COLOR
,
MEMBER_OUTER_STATUS_TYPE
,
}
from
'../constant'
;
...
...
@@ -52,7 +50,7 @@ const MemberMaintain: React.FC<[]> = () => {
const
ref
=
useRef
<
any
>
({});
const
intl
=
useIntl
();
const
defaultColumns
:
ColumnType
<
any
>
[]
=
[
const
defaultColumns
:
ColumnType
<
GetMemberAbilityMaintenancePageResponseDetail
>
[]
=
[
{
title
:
`
${
intl
.
formatMessage
({
id
:
'member.management.maintain.query.memberId'
})}
/
${
intl
.
formatMessage
({
id
:
'member.management.maintain.query.memberName'
})}
`
,
dataIndex
:
'memberId'
,
...
...
@@ -81,7 +79,7 @@ const MemberMaintain: React.FC<[]> = () => {
{
title
:
intl
.
formatMessage
({
id
:
'member.management.maintain.query.level'
}),
dataIndex
:
'level'
,
render
:
(
text
)
=>
<
LevelBrand
level=
{
text
}
/>
,
render
:
(
_
,
record
)
=>
record
.
levelTag
,
},
{
title
:
`
${
intl
.
formatMessage
({
id
:
'member.management.maintain.query.sourceName'
})}
/
${
intl
.
formatMessage
({
id
:
'member.management.maintain.query.registerTime'
})}
`
,
...
...
src/pages/member/memberMaintain/unfreeze/index.tsx
View file @
37ba3d93
...
...
@@ -27,7 +27,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
FlowRecords
from
'@/components/FlowRecords'
;
import
CustomizeColumn
from
'@/components/CustomizeColumn'
;
import
NiceForm
from
'@/components/NiceForm'
;
...
...
@@ -137,7 +136,7 @@ const MemberMaintainUnfreeze: React.FC<{}> = () => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
2
}
/>
memberInfo
.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberQuery/detailed/index.tsx
View file @
37ba3d93
...
...
@@ -7,7 +7,6 @@ import {
BarChartOutlined
,
InsuranceOutlined
,
BulbOutlined
,
EditOutlined
,
}
from
'@ant-design/icons'
;
import
{
observer
,
inject
}
from
'mobx-react'
;
import
{
usePageStatus
}
from
'@/hooks/usePageStatus'
;
...
...
@@ -19,7 +18,6 @@ import {
}
from
'@/constants/member'
;
import
AnchorPage
from
'@/components/AnchorPage'
;
import
AvatarWrap
from
'@/components/AvatarWrap'
;
import
LevelBrand
from
'@/components/LevelBrand'
;
import
Bookmark
from
'../../components/Bookmark'
;
interface
QueryProps
{
...
...
@@ -222,7 +220,7 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
name
:
memberInfo
?.
name
,
}
}
extra=
{
(
<
LevelBrand
level=
{
memberInfo
?.
level
}
/>
memberInfo
?.
levelTag
)
}
/>
)
}
...
...
src/pages/member/memberQuery/index.tsx
View file @
37ba3d93
...
...
@@ -4,7 +4,6 @@ import {
Card
,
Space
,
Button
,
Badge
,
}
from
'antd'
;
import
{
PlusOutlined
,
...
...
@@ -26,7 +25,6 @@ import { querySchema } from './schema';
import
{
MEMBER_OUTER_STATUS_TYPE
,
}
from
'../constant'
;
import
LevelBrand
from
'../../../components/LevelBrand'
;
import
AddRoleDrawer
from
'./components/AddRoleDrawer'
;
import
{
AuthUrl
}
from
'@/components/AuthButton/AuthUrl'
;
import
AuthButton
from
'@/components/AuthButton'
;
...
...
@@ -95,7 +93,7 @@ const MemberQuery: React.FC<{}> = () => {
{
title
:
intl
.
formatMessage
({
id
:
'member.memberQuery.query.defaultColumns.level'
}),
dataIndex
:
'level'
,
render
:
text
=>
<
LevelBrand
level=
{
text
}
/>
,
render
:
(
_
,
record
)
=>
record
.
levelTag
,
},
{
title
:
intl
.
formatMessage
({
id
:
'member.memberQuery.query.defaultColumns.levelTypeName'
}),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment