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
shenshaokai
jinfa-platform
Commits
3c5b0556
Commit
3c5b0556
authored
Apr 26, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 商品审核进度角色同步当前角色
parent
2332cd3d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
3 deletions
+18
-3
addBrand.tsx
src/pages/trademark/addBrand.tsx
+1
-1
checkBrandDetail.tsx
src/pages/trademark/checkBrandDetail.tsx
+17
-2
No files found.
src/pages/trademark/addBrand.tsx
View file @
3c5b0556
...
...
@@ -152,7 +152,7 @@ const AddBrand: React.FC<{}> = () => {
{
hasSelfStore
?
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.1.description'
})
}
/>
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
roles
.
filter
(
item
=>
item
.
memberRoleId
===
memberRoleId
)[
0
][
'memberRoleName'
]
}
/>
:
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2.description'
})
}
/>
}
...
...
src/pages/trademark/checkBrandDetail.tsx
View file @
3c5b0556
...
...
@@ -11,6 +11,8 @@ import ReutrnEle from '@/components/ReturnEle'
import
moment
from
'moment'
import
styles
from
'./index.less'
import
{
getProductBrandGetBrandCheckRecord
,
getProductBrandGetBrand
,
postProductBrandCheckBrand
}
from
'@/services/ProductV2Api'
import
{
postManageActivityShopRuleExistShop
}
from
'@/services/ManageV2Api'
import
{
getAuth
}
from
'@/utils/auth'
const
{
Step
}
=
Steps
const
{
TextArea
}
=
Input
...
...
@@ -27,13 +29,19 @@ const CheckBrandDetail: React.FC<{}> = () => {
const
[
recordData
,
setRecordData
]
=
useState
<
any
[]
>
([])
const
[
checkForm
]
=
Form
.
useForm
();
const
[
disableCheck
,
setDisableCheck
]
=
useState
<
boolean
>
(
false
)
const
[
hasSelfStore
,
setHasSelfStore
]
=
useState
<
boolean
>
(
false
)
const
[
checkStatus
,
setCheckStatus
]
=
useState
<
number
>
(
4
)
const
{
roles
,
memberRoleId
,
memberId
}
=
getAuth
()
||
{};
useEffect
(()
=>
{
const
{
id
}
=
history
.
location
.
query
if
(
id
){
loadPageData
(
id
)
}
postManageActivityShopRuleExistShop
({
memberId
,
memberRoleId
},
{
ctlType
:
'none'
}).
then
(
res
=>
{
const
{
code
,
data
}
=
res
setHasSelfStore
(
data
)
})
},
[])
const
columns
:
ColumnType
<
any
>
[]
=
[
...
...
@@ -211,8 +219,15 @@ const CheckBrandDetail: React.FC<{}> = () => {
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1'
})
}
>
<
Steps
progressDot
current=
{
fixStep
}
>
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.1'
})
}
description=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.1.description'
})
}
/>
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.1.description'
})
}
/>
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.1'
})
}
description=
{
roles
.
filter
(
item
=>
item
.
memberRoleId
===
memberRoleId
)[
0
][
'memberRoleName'
]
}
/>
{
/* <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} /> */
}
{
hasSelfStore
?
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
roles
.
filter
(
item
=>
item
.
memberRoleId
===
memberRoleId
)[
0
][
'memberRoleName'
]
}
/>
:
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2.description'
})
}
/>
}
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
""
/>
</
Steps
>
</
Card
>
...
...
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