Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
872dc05d
Commit
872dc05d
authored
Apr 01, 2022
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: 去掉等级标签组件直接展示等级标签
parent
ef4ea68d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
30 additions
and
44 deletions
+30
-44
index.tsx
src/pages/memberManage/components/HeadInfo/index.tsx
+3
-4
index.tsx
src/pages/memberManage/memberMaintain/detailed/index.tsx
+1
-1
frozen.tsx
src/pages/memberManage/memberMaintain/frozen.tsx
+1
-1
index.tsx
src/pages/memberManage/memberMaintain/index.tsx
+4
-10
index.tsx
...es/memberManage/memberPr1/components/DetailInfo/index.tsx
+1
-1
index.tsx
src/pages/memberManage/memberPr1/index.tsx
+5
-7
index.tsx
...es/memberManage/memberPr2/components/DetailInfo/index.tsx
+1
-1
index.tsx
src/pages/memberManage/memberPr2/index.tsx
+4
-6
index.tsx
...berManage/memberPrConfirm/components/DetailInfo/index.tsx
+1
-1
index.tsx
src/pages/memberManage/memberPrConfirm/index.tsx
+4
-6
index.tsx
...mberManage/memberPrSubmit/components/DetailInfo/index.tsx
+1
-1
index.tsx
src/pages/memberManage/memberPrSubmit/index.tsx
+4
-5
No files found.
src/pages/memberManage/components/HeadInfo/index.tsx
View file @
872dc05d
import
React
from
'react'
;
import
LevelBrand
from
'../LevelBrand'
;
import
styles
from
'./index.less'
;
export
interface
HeadInfoProps
{
info
:
{
name
?:
string
,
level
?:
number
,
name
?:
string
,
level
Tag
:
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
>
);
...
...
src/pages/memberManage/memberMaintain/detailed/index.tsx
View file @
872dc05d
...
...
@@ -130,7 +130,7 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberMaintain/frozen.tsx
View file @
872dc05d
...
...
@@ -85,7 +85,7 @@ const Frozen: React.FC<{}> = () => {
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberMaintain/index.tsx
View file @
872dc05d
...
...
@@ -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
>
</>
),
...
...
src/pages/memberManage/memberPr1/components/DetailInfo/index.tsx
View file @
872dc05d
...
...
@@ -270,7 +270,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberPr1/index.tsx
View file @
872dc05d
import
React
,
{
useState
,
use
Effect
,
use
Ref
}
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
>
</>
),
...
...
src/pages/memberManage/memberPr2/components/DetailInfo/index.tsx
View file @
872dc05d
...
...
@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberPr2/index.tsx
View file @
872dc05d
import
React
,
{
useState
,
use
Effect
,
use
Ref
}
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
>
</>
),
...
...
src/pages/memberManage/memberPrConfirm/components/DetailInfo/index.tsx
View file @
872dc05d
...
...
@@ -271,7 +271,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberPrConfirm/index.tsx
View file @
872dc05d
...
...
@@ -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
>
</>
),
...
...
src/pages/memberManage/memberPrSubmit/components/DetailInfo/index.tsx
View file @
872dc05d
...
...
@@ -304,7 +304,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
<
HeadInfo
info=
{
{
name
:
basicInfo
?.
name
,
level
:
1
,
level
Tag
:
basicInfo
?.
levelTag
!
,
}
}
/>
}
...
...
src/pages/memberManage/memberPrSubmit/index.tsx
View file @
872dc05d
...
...
@@ -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
>
</>
),
...
...
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