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
project
jinfa-admin
Commits
66a3e259
Commit
66a3e259
authored
Sep 15, 2020
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:价格显示处理
parent
46551319
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
10 deletions
+26
-10
index.tsx
src/pages/commodity/productWillCheck/index.tsx
+12
-4
index.tsx
src/pages/commodity/products/index.tsx
+12
-4
index.tsx
src/pages/trademark/trademarkSearch/index.tsx
+1
-1
index.tsx
src/pages/trademark/trademarkWillCheck/index.tsx
+1
-1
No files found.
src/pages/commodity/productWillCheck/index.tsx
View file @
66a3e259
...
...
@@ -97,10 +97,18 @@ const Products: React.FC<{}> = () => {
dataIndex
:
'min'
,
key
:
'min'
,
render
:
(
text
:
any
,
reocrd
:
any
)
=>
{
if
(
reocrd
.
priceType
===
1
)
return
<>
¥
{
reocrd
.
min
}
~ ¥
{
reocrd
.
max
}
</>
if
(
reocrd
.
priceType
===
3
)
return
<>
{
reocrd
.
min
}
~
{
reocrd
.
max
}
</>
if
(
reocrd
.
priceType
===
1
){
if
(
reocrd
.
max
===
reocrd
.
min
)
return
<>
¥
{
reocrd
.
min
}
</>
else
return
<>
¥
{
reocrd
.
min
}
~ ¥
{
reocrd
.
max
}
</>
}
if
(
reocrd
.
priceType
===
3
){
if
(
reocrd
.
max
===
reocrd
.
min
)
return
<>
{
reocrd
.
min
}
</>
else
return
<>
{
reocrd
.
min
}
~
{
reocrd
.
max
}
</>
}
if
(
reocrd
.
priceType
===
2
)
return
null
}
...
...
src/pages/commodity/products/index.tsx
View file @
66a3e259
...
...
@@ -111,10 +111,18 @@ const Products: React.FC<{}> = () => {
dataIndex
:
'min'
,
key
:
'min'
,
render
:
(
text
:
any
,
reocrd
:
any
)
=>
{
if
(
reocrd
.
priceType
===
1
)
return
<>
¥
{
reocrd
.
min
}
~ ¥
{
reocrd
.
max
}
</>
if
(
reocrd
.
priceType
===
3
)
return
<>
{
reocrd
.
min
}
~
{
reocrd
.
max
}
</>
if
(
reocrd
.
priceType
===
1
){
if
(
reocrd
.
max
===
reocrd
.
min
)
return
<>
¥
{
reocrd
.
min
}
</>
else
return
<>
¥
{
reocrd
.
min
}
~ ¥
{
reocrd
.
max
}
</>
}
if
(
reocrd
.
priceType
===
3
){
if
(
reocrd
.
max
===
reocrd
.
min
)
return
<>
{
reocrd
.
min
}
</>
else
return
<>
{
reocrd
.
min
}
~
{
reocrd
.
max
}
</>
}
if
(
reocrd
.
priceType
===
2
)
return
null
}
...
...
src/pages/trademark/trademarkSearch/index.tsx
View file @
66a3e259
...
...
@@ -48,7 +48,7 @@ const Trademark: React.FC<{}> = () => {
key
:
'memberName'
,
},
{
title
:
'申请时间'
,
title
:
'申请
审核
时间'
,
dataIndex
:
'applyTime'
,
key
:
'applyTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
...
...
src/pages/trademark/trademarkWillCheck/index.tsx
View file @
66a3e259
...
...
@@ -50,7 +50,7 @@ const Trademark: React.FC<{}> = () => {
key
:
'memberName'
,
},
{
title
:
'申请时间'
,
title
:
'申请
审核
时间'
,
dataIndex
:
'applyTime'
,
key
:
'applyTime'
,
render
:
(
text
:
any
,
record
:
any
)
=>
text
&&
moment
(
text
).
format
(
'YYYY-MM-DD HH:mm:ss'
),
...
...
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