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
ffe9ddf7
Commit
ffe9ddf7
authored
Dec 01, 2021
by
卢均锐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 商品能力-品牌模块国际化
parent
7b331143
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
199 additions
and
112 deletions
+199
-112
zh-CN.ts
src/locales/zh-CN.ts
+2
-0
trademark.ts
src/locales/zh-CN/trademark.ts
+79
-0
addBrand.tsx
src/pages/trademark/addBrand.tsx
+46
-42
index.tsx
src/pages/trademark/index.tsx
+33
-32
viewBrand.tsx
src/pages/trademark/viewBrand.tsx
+39
-38
No files found.
src/locales/zh-CN.ts
View file @
ffe9ddf7
...
...
@@ -11,6 +11,7 @@ import purchase from './zh-CN/purchase'
import
editor
from
'./zh-CN/editor'
import
content
from
'./zh-CN/content'
import
commodity
from
'./zh-CN/commodity'
import
trademark
from
'./zh-CN/trademark'
export
default
{
'global.siteName'
:
'瓴犀'
,
...
...
@@ -23,6 +24,7 @@ export default {
...
handling
,
...
classAndProperty
,
...
commodity
,
...
trademark
,
...
member
,
...
purchase
,
...
editor
,
...
...
src/locales/zh-CN/trademark.ts
0 → 100644
View file @
ffe9ddf7
export
default
{
'trademark.columns.name'
:
'品牌名称'
,
'trademark.columns.sourceBrandName'
:
'原品牌'
,
'trademark.columns.applyTime'
:
'申请审核时间'
,
'trademark.columns.isEnable'
:
'状态'
,
'trademark.columns.isEnable.popconfirm.title'
:
'确定要执行这个操作?'
,
'trademark.columns.isEnable.popconfirm.okText'
:
'是'
,
'trademark.columns.isEnable.popconfirm.cancelText'
:
'否'
,
'trademark.columns.isEnable.button.1'
:
'有效'
,
'trademark.columns.isEnable.button.2'
:
'无效'
,
'trademark.columns.status'
:
'审核状态'
,
'trademark.columns.option'
:
'操作'
,
'trademark.columns.option.button.1'
:
'提交审核'
,
'trademark.columns.option.button.2'
:
'修改'
,
'trademark.columns.option.button.3'
:
'删除'
,
'trademark.columns.option.button.4'
:
'更多'
,
'trademark.handelDelete.title'
:
'确定要执行这个操作?'
,
'trademark.handelDelete.okText'
:
'确定'
,
'trademark.handelDelete.cancelText'
:
'取消'
,
'trademark.actions'
:
'新建'
,
'trademark.schema.name'
:
'请输入品牌名称'
,
'trademark.schema.status.1'
:
'全部'
,
'trademark.schema.status.2'
:
'待提交审核'
,
'trademark.schema.status.3'
:
'待审核'
,
'trademark.schema.status.4'
:
'审核不通过'
,
'trademark.schema.status.5'
:
'审核通过'
,
'trademark.schema.status.placeholder'
:
'状态'
,
'trademark.schema.submit'
:
'查询'
,
'trademark.viewBrand.brandOpeartionLabel.1'
:
'提交审核'
,
'trademark.viewBrand.brandOpeartionLabel.2'
:
'修改品牌'
,
'trademark.viewBrand.brandOpeartionLabel.3'
:
'审核品牌'
,
'trademark.viewBrand.columns.id'
:
'序号'
,
'trademark.viewBrand.columns.memberRoleName'
:
'角色'
,
'trademark.viewBrand.columns.status'
:
'状态'
,
'trademark.viewBrand.columns.operation'
:
'操作'
,
'trademark.viewBrand.columns.createTime'
:
'操作时间'
,
'trademark.viewBrand.columns.checkRemark'
:
'意见'
,
'trademark.viewBrand.tips'
:
'证明材料'
,
'trademark.viewBrand.tips.tooltip'
:
'证明材料:如商标注册证书、品牌授权证书等证明材料'
,
'trademark.viewBrand.content.label.1'
:
'申请审核时间'
,
'trademark.viewBrand.content.label.2'
:
'审核状态'
,
'trademark.viewBrand.content.label.3'
:
'品牌状态'
,
'trademark.viewBrand.content.label.3.isEnable.1'
:
'有效'
,
'trademark.viewBrand.content.label.3.isEnable.2'
:
'无效'
,
'trademark.viewBrand.extra'
:
'修改'
,
'trademark.viewBrand.card.1'
:
'流程进度'
,
'trademark.viewBrand.card.1.step.1'
:
'提交审核'
,
'trademark.viewBrand.card.1.step.1.description'
:
'供应商'
,
'trademark.viewBrand.card.1.step.2'
:
'审核品牌'
,
'trademark.viewBrand.card.1.step.2.description'
:
'平台'
,
'trademark.viewBrand.card.1.step.3'
:
'完成'
,
'trademark.viewBrand.card.2'
:
'审核历史'
,
'trademark.addBrand.error.1'
:
'仅支持上传JPEG/JPG/PNG文件!'
,
'trademark.addBrand.error.2'
:
'上传图片不超过60K!'
,
'trademark.addBrand.error.3'
:
'上传图片不超过2MB!'
,
'trademark.addBrand.uploadText'
:
'上传图片'
,
'trademark.addBrand.tips'
:
'证明材料'
,
'trademark.addBrand.tips.tooltip'
:
'证明材料:如商标注册证书、品牌授权证书等证明材料'
,
'trademark.addBrand.back'
:
'返回'
,
'trademark.addBrand.title.1'
:
'修改品牌'
,
'trademark.addBrand.title.2'
:
'新建品牌'
,
'trademark.addBrand.extra.1'
:
'直接提交审核'
,
'trademark.addBrand.extra.2'
:
'保存'
,
'trademark.addBrand.card.1'
:
'流程进度'
,
'trademark.addBrand.card.1.step.1'
:
'提交审核'
,
'trademark.addBrand.card.1.step.2'
:
'审核品牌'
,
'trademark.addBrand.card.1.step.2.description'
:
'平台'
,
'trademark.addBrand.card.1.step.3'
:
'完成'
,
'trademark.addBrand.card.2'
:
'基本信息'
,
'trademark.addBrand.card.2.name'
:
'品牌名称'
,
'trademark.addBrand.card.2.name.message'
:
'输入品牌名称!'
,
'trademark.addBrand.card.2.name.placeholder'
:
'输入品牌名称'
,
'trademark.addBrand.card.2.logoUrl'
:
'品牌LOGO'
,
'trademark.addBrand.card.2.logoUrl.extra'
:
'支持JPG/PNG/JPEG,最大不超过 60K,为了减少加载数据量,只建议一级项目使用'
,
'trademark.addBrand.card.2.logoUrl.message'
:
'上传图片!'
,
};
src/pages/trademark/addBrand.tsx
View file @
ffe9ddf7
This diff is collapsed.
Click to expand it.
src/pages/trademark/index.tsx
View file @
ffe9ddf7
import
React
,
{
ReactNode
,
useRef
,
useMemo
}
from
'react'
import
{
history
}
from
'umi'
import
{
history
,
useIntl
}
from
'umi'
import
{
Button
,
Popconfirm
,
Card
,
Dropdown
,
Menu
,
Modal
,
Space
,
Badge
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
...
...
@@ -27,6 +27,7 @@ const { confirm } = Modal
const
formActions
=
createFormActions
();
const
Trademark
:
React
.
FC
<
{}
>
=
()
=>
{
const
intl
=
useIntl
();
const
ref
=
useRef
<
any
>
({})
/** 带参数查询,给表单带默认值 */
const
{
searchData
,
formatInitialValue
,
clear
}
=
useSetSearchValueInTable
();
...
...
@@ -69,56 +70,56 @@ const Trademark: React.FC<{}> = () => {
key
:
'id'
,
},
{
title
:
'品牌名称'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.name'
})
,
dataIndex
:
'name'
,
key
:
'name'
,
className
:
'commonPickColor'
,
render
:
(
text
:
any
,
record
:
any
)
=>
<
span
className=
"commonPickColor"
onClick=
{
()
=>
handleSee
(
record
)
}
>
{
text
}
<
EyeOutlined
/></
span
>
},
{
title
:
'原品牌'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.sourceBrandName'
})
,
// dataIndex: ['sourceBrand', 'name'],
dataIndex
:
'sourceBrandName'
,
key
:
'sourceBrandName'
,
},
{
title
:
'申请审核时间'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.applyTime'
})
,
dataIndex
:
'applyTime'
,
key
:
'applyTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
},
{
title
:
'状态'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable'
})
,
dataIndex
:
'isEnable'
,
key
:
'isEnable'
,
render
:
(
text
:
any
,
record
:
any
)
=>
{
let
component
:
ReactNode
=
null
component
=
(
<
Popconfirm
title=
"确定要执行这个操作?"
title=
{
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable.popconfirm.title'
})
}
onConfirm=
{
()
=>
confirmUpdate
(
record
)
}
onCancel=
{
cancel
}
okText=
"是"
cancelText=
"否"
okText=
{
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable.popconfirm.okText'
})
}
cancelText=
{
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable.popconfirm.cancelText'
})
}
disabled=
{
record
.
status
!==
4
}
>
<
Button
disabled=
{
record
.
status
!==
4
}
type=
"link"
style=
{
record
.
isEnable
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
isEnable
?
<>
有效
<
PlayCircleOutlined
/></>
:
<>
无效
<
PauseCircleOutlined
/></>
}
</
Button
>
style=
{
record
.
isEnable
?
{
color
:
'#00B37A'
}
:
{
color
:
'red'
}
}
>
{
record
.
isEnable
?
<>
{
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable.button.1'
})
}
<
PlayCircleOutlined
/></>
:
<>
{
intl
.
formatMessage
({
id
:
'trademark.columns.isEnable.button.2'
})
}
<
PauseCircleOutlined
/></>
}
</
Button
>
</
Popconfirm
>
)
return
component
}
},
{
title
:
'审核状态'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.status'
})
,
dataIndex
:
'status'
,
key
:
'status'
,
render
:
(
t
)
=>
<
Badge
color=
{
productStatusColor
[
t
]
}
text=
{
productStatusLabel
[
t
]
}
/>
},
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.columns.option'
})
,
dataIndex
:
'option'
,
render
:
(
text
:
any
,
record
:
any
)
=>
{
// 1待提交审核 2待审核 3审核不通过 4审核通过
...
...
@@ -126,19 +127,19 @@ const Trademark: React.FC<{}> = () => {
(
record
.
status
!==
2
)
?
<>
{
record
.
status
===
1
?
<>
<
Button
type=
'link'
onClick=
{
()
=>
handleApplyCheck
(
record
)
}
>
提交审核
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
handleApplyCheck
(
record
)
}
>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.1'
})
}
</
Button
>
<
Dropdown
overlay=
{
<
Menu
>
<
Menu
.
Item
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/edit?id=${record.id}`
)
}
>
修改
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/edit?id=${record.id}`
)
}
>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.2'
})
}
</
Button
>
</
Menu
.
Item
>
<
Menu
.
Item
>
<
Button
onClick=
{
()
=>
handelDelete
(
record
)
}
type=
'link'
>
删除
</
Button
>
<
Button
onClick=
{
()
=>
handelDelete
(
record
)
}
type=
'link'
>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.3'
})
}
</
Button
>
</
Menu
.
Item
>
</
Menu
>
}
>
<
a
className=
"ant-dropdown-link"
onClick=
{
e
=>
e
.
preventDefault
()
}
>
更多
<
CaretDownOutlined
/>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.4'
})
}
<
CaretDownOutlined
/>
</
a
>
</
Dropdown
>
</>
:
...
...
@@ -146,11 +147,11 @@ const Trademark: React.FC<{}> = () => {
<>
{
record
.
isEnable
&&
<>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/add?id=${record.id}`
)
}
>
修改
</
Button
>
<
Button
type=
'link'
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/add?id=${record.id}`
)
}
>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.2'
})
}
</
Button
>
</>
}
{
record
.
status
===
3
&&
<
Button
onClick=
{
()
=>
handelDelete
(
record
)
}
type=
'link'
>
删除
</
Button
>
record
.
status
===
3
&&
<
Button
onClick=
{
()
=>
handelDelete
(
record
)
}
type=
'link'
>
{
intl
.
formatMessage
({
id
:
'trademark.columns.option.button.3'
})
}
</
Button
>
}
</>
}
...
...
@@ -176,14 +177,14 @@ const Trademark: React.FC<{}> = () => {
const
handelDelete
=
(
record
:
any
)
=>
{
confirm
({
title
:
'确定要执行删除操作?'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.handelDelete.title'
})
,
icon
:
<
ExclamationCircleOutlined
/>,
okText
:
'确定'
,
okText
:
intl
.
formatMessage
({
id
:
'trademark.handelDelete.okText'
})
,
okType
:
'danger'
,
cancelText
:
'取消'
,
cancelText
:
intl
.
formatMessage
({
id
:
'trademark.handelDelete.cancelText'
})
,
onOk
()
{
postProductBrandDeleteBrand
({
id
:
record
.
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
if
(
res
.
code
===
1000
)
ref
.
current
.
reload
()
})
},
...
...
@@ -193,15 +194,15 @@ const Trademark: React.FC<{}> = () => {
});
}
const
handleApplyCheck
=
(
record
:
any
)
=>
{
postProductBrandApplyCheckBrand
({
id
:
record
.
id
}).
then
(
res
=>
{
const
handleApplyCheck
=
(
record
:
any
)
=>
{
postProductBrandApplyCheckBrand
({
id
:
record
.
id
}).
then
(
res
=>
{
ref
.
current
.
reload
()
})
}
const
Actions
=
<
Space
>
<
Button
type=
"primary"
icon=
{
<
PlusOutlined
/>
}
onClick=
{
()
=>
history
.
push
(
'/memberCenter/commodityAbility/trademark/add'
)
}
>
新建
{
intl
.
formatMessage
({
id
:
'trademark.actions'
})
}
</
Button
>
</
Space
>
...
...
@@ -258,7 +259,7 @@ const Trademark: React.FC<{}> = () => {
type
:
'string'
,
"x-component"
:
'Search'
,
'x-component-props'
:
{
placeholder
:
'请输入品牌名称'
,
placeholder
:
intl
.
formatMessage
({
id
:
'trademark.schema.name'
})
,
align
:
'flex-end'
,
},
}
...
...
@@ -279,20 +280,20 @@ const Trademark: React.FC<{}> = () => {
status
:
{
type
:
'string'
,
enum
:
[
{
label
:
'全部'
,
value
:
0
},
{
label
:
'待提交审核'
,
value
:
1
},
{
label
:
'待审核'
,
value
:
2
},
{
label
:
'审核不通过'
,
value
:
3
},
{
label
:
'审核通过'
,
value
:
4
}
{
label
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.1'
})
,
value
:
0
},
{
label
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.2'
})
,
value
:
1
},
{
label
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.3'
})
,
value
:
2
},
{
label
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.4'
})
,
value
:
3
},
{
label
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.5'
})
,
value
:
4
}
],
'x-component-props'
:
{
placeholder
:
'状态'
,
placeholder
:
intl
.
formatMessage
({
id
:
'trademark.schema.status.placeholder'
})
,
}
},
submit
:
{
'x-component'
:
'Submit'
,
'x-component-props'
:
{
children
:
'查询'
,
children
:
intl
.
formatMessage
({
id
:
'trademark.schema.submit'
})
,
},
},
},
...
...
src/pages/trademark/viewBrand.tsx
View file @
ffe9ddf7
import
React
,
{
useState
,
useEffect
}
from
'react'
import
{
history
}
from
'umi'
import
{
history
,
useIntl
,
getIntl
}
from
'umi'
import
{
Button
,
Steps
,
Card
,
Space
,
Tooltip
,
Row
,
Col
,
Descriptions
,
Table
,
Badge
}
from
'antd'
import
{
PageHeaderWrapper
}
from
'@ant-design/pro-layout'
import
{
...
...
@@ -17,12 +17,13 @@ const { Step } = Steps;
const
BrandOpeartionLabel
=
[
''
,
'提交审核'
,
'修改品牌'
,
'审核品牌'
getIntl
().
formatMessage
({
id
:
'trademark.viewBrand.brandOpeartionLabel.1'
})
,
getIntl
().
formatMessage
({
id
:
'trademark.viewBrand.brandOpeartionLabel.2'
})
,
getIntl
().
formatMessage
({
id
:
'trademark.viewBrand.brandOpeartionLabel.3'
})
]
const
viewBrand
:
React
.
FC
<
{}
>
=
()
=>
{
const
intl
=
useIntl
();
const
[
queryId
,
setQueryId
]
=
useState
<
number
>
(
null
)
const
[
brandInfo
,
setBrandInfo
]
=
useState
<
any
>
({})
...
...
@@ -31,22 +32,22 @@ const viewBrand: React.FC<{}> = () => {
useEffect
(()
=>
{
const
{
id
}
=
history
.
location
.
query
if
(
id
)
{
if
(
id
)
{
setQueryId
(
id
)
getProductBrandGetBrand
({
id
:
id
}).
then
(
res
=>
{
getProductBrandGetBrand
({
id
:
id
}).
then
(
res
=>
{
console
.
log
(
res
.
data
,
'data'
)
if
(
res
.
code
===
1000
)
{
if
(
res
.
code
===
1000
)
{
setBrandInfo
(
res
.
data
)
if
(
res
.
data
.
status
===
1
)
if
(
res
.
data
.
status
===
1
)
setFixStep
(
0
)
else
if
(
res
.
data
.
status
===
2
)
else
if
(
res
.
data
.
status
===
2
)
setFixStep
(
1
)
else
setFixStep
(
2
)
}
})
getProductBrandGetBrandCheckRecord
({
brandId
:
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
getProductBrandGetBrandCheckRecord
({
brandId
:
id
}).
then
(
res
=>
{
if
(
res
.
code
===
1000
)
setRecordData
(
res
.
data
)
})
}
...
...
@@ -54,60 +55,60 @@ const viewBrand: React.FC<{}> = () => {
const
columns
:
ColumnType
<
any
>
[]
=
[
{
title
:
'序号'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.id'
})
,
dataIndex
:
'id'
,
key
:
'id'
,
render
:
(
text
,
record
,
index
)
=>
index
+
1
render
:
(
text
,
record
,
index
)
=>
index
+
1
},
{
title
:
'角色'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.memberRoleName'
})
,
dataIndex
:
'memberRoleName'
,
key
:
'memberRoleName'
,
},
{
title
:
'状态'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.status'
})
,
dataIndex
:
'status'
,
key
:
'status'
,
render
:
(
t
)
=>
<
Badge
color=
{
productStatusColor
[
t
]
}
text=
{
productStatusLabel
[
t
]
}
/>
},
{
title
:
'操作'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.operation'
})
,
dataIndex
:
'operation'
,
key
:
'operation'
,
render
:
(
t
)
=>
BrandOpeartionLabel
[
t
]
},
{
title
:
'操作时间'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.createTime'
})
,
dataIndex
:
'createTime'
,
key
:
'createTime'
,
render
:
(
text
)
=>
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
},
{
title
:
'意见'
,
title
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.columns.checkRemark'
})
,
dataIndex
:
'checkRemark'
,
key
:
'checkRemark'
,
},
];
const
fixProveUrl
=
(
proveInfo
:
any
)
=>
{
if
(
proveInfo
)
{
if
(
proveInfo
)
{
let
imgArray
=
Object
.
values
(
proveInfo
)
return
imgArray
.
map
((
item
:
string
,
index
:
number
)
=>
<
Col
key=
{
index
}
span=
{
3
}
xxl=
{
3
}
xl=
{
4
}
lg=
{
4
}
>
<
div
className=
{
styles
.
proveBox
}
>
<
img
src=
{
item
}
alt=
""
/>
<
img
src=
{
item
}
alt=
""
/>
</
div
>
</
Col
>
)
}
}
const
tips
=
<>
证明材料
<
Tooltip
title=
"证明材料:如商标注册证书、品牌授权证书等证明材料"
><
span
>
<
QuestionCircleOutlined
/></
span
></
Tooltip
></>
const
tips
=
<>
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.tips'
})
}
<
Tooltip
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.tips.tooltip'
})
}
><
span
>
<
QuestionCircleOutlined
/></
span
></
Tooltip
></>
const
content
=
<>
<
Descriptions
colon=
{
true
}
style=
{
{
textAlign
:
'center'
,
marginLeft
:
100
,
width
:
800
}
}
>
<
Descriptions
.
Item
label=
"申请审核时间"
>
{
brandInfo
.
applyTime
&&
moment
(
brandInfo
.
applyTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"审核状态"
>
<
Descriptions
colon=
{
true
}
style=
{
{
textAlign
:
'center'
,
marginLeft
:
100
,
width
:
800
}
}
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.content.label.1'
})
}
>
{
brandInfo
.
applyTime
&&
moment
(
brandInfo
.
applyTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.content.label.2'
})
}
>
<
Badge
color=
{
productStatusColor
[
brandInfo
?.
status
]
}
text=
{
productStatusLabel
[
brandInfo
?.
status
]
}
/>
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
"品牌状态"
>
{
brandInfo
.
isEnable
?
'有效'
:
'无效'
}
</
Descriptions
.
Item
>
<
Descriptions
.
Item
label=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.content.label.3'
})
}
>
{
brandInfo
.
isEnable
?
intl
.
formatMessage
({
id
:
'trademark.viewBrand.content.label.3.isEnable.1'
})
:
intl
.
formatMessage
({
id
:
'trademark.viewBrand.content.label.3.isEnable.2'
})
}
</
Descriptions
.
Item
>
</
Descriptions
>
</>
...
...
@@ -122,16 +123,16 @@ const viewBrand: React.FC<{}> = () => {
icon=
{
<
FormOutlined
/>
}
key=
"1"
type=
"primary"
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/edit?id=${brandInfo.id}`
)
}
disabled=
{
!
(
brandInfo
.
status
===
1
||
brandInfo
.
status
===
3
)
}
style=
{
{
display
:
!
(
brandInfo
.
status
===
1
||
brandInfo
.
status
===
3
)?
'none'
:
'block'
}
}
onClick=
{
()
=>
history
.
push
(
`/memberCenter/commodityAbility/trademark/edit?id=${brandInfo.id}`
)
}
disabled=
{
!
(
brandInfo
.
status
===
1
||
brandInfo
.
status
===
3
)
}
style=
{
{
display
:
!
(
brandInfo
.
status
===
1
||
brandInfo
.
status
===
3
)
?
'none'
:
'block'
}
}
>
修改
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.extra'
})
}
</
Button
>,
]
}
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
{
tips
}
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
{
tips
}
>
<
Row
gutter=
{
24
}
>
{
fixProveUrl
(
brandInfo
.
proveUrl
)
...
...
@@ -139,17 +140,17 @@ const viewBrand: React.FC<{}> = () => {
</
Row
>
</
Card
>
</
Space
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
"流程进度"
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1'
})
}
>
<
Steps
progressDot
current=
{
fixStep
}
>
<
Step
title=
"提交审核"
description=
"供应商"
/>
<
Step
title=
"审核品牌"
description=
"平台"
/>
<
Step
title=
"完成"
description=
""
/>
<
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.2.description'
})
}
/>
<
Step
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.1.step.2'
})
}
description=
""
/>
</
Steps
>
</
Card
>
</
Space
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
"审核历史"
>
<
Space
direction=
"vertical"
style=
{
{
width
:
'100%'
}
}
>
<
Card
headStyle=
{
{
borderBottom
:
'none'
}
}
title=
{
intl
.
formatMessage
({
id
:
'trademark.viewBrand.card.2'
})
}
>
<
Table
dataSource=
{
recordData
}
columns=
{
columns
}
pagination=
{
false
}
/>
</
Card
>
</
Space
>
...
...
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