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
f77a49f5
Commit
f77a49f5
authored
Feb 16, 2022
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 新增商品设置价格大于0,处理英文站销售订单查询状态显示超出问题
parent
adc65952
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
priceAttributeForm.tsx
...commodity/products/addProductsItem/priceAttributeForm.tsx
+2
-2
index.tsx
src/pages/transaction/components/statusColors/index.tsx
+11
-1
No files found.
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @
f77a49f5
...
...
@@ -965,7 +965,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
rules=
{
[
{
required
:
true
,
message
:
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.1'
})
},
{
pattern
:
/^
\d
+
(\.\d
{1,4}
)?
$/
,
pattern
:
/^
([
0
](\.\d
{1,4}
))
$|^
([
1-9
][
0-9
]
*
(\.\d
{1,4}
)?)
$/
,
message
:
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.2'
}),
}
]
}
...
...
@@ -1021,7 +1021,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
message
:
planPrice
===
3
?
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.1'
})
:
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.2'
})
},
{
pattern
:
planPrice
!==
3
?
/^
\d
+
(\.\d
{1,4}
)?
$/
:
/^
[
1-9
]\d
*$/
,
pattern
:
planPrice
!==
3
?
/^
([
0
](\.\d
{1,4}
))
$|^
([
1-9
][
0-9
]
*
(\.\d
{1,4}
)?)
$/
:
/^
[
1-9
]\d
*$/
,
message
:
planPrice
!==
3
?
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.3'
})
:
intl
.
formatMessage
({
id
:
'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.4'
}),
}
]
}
...
...
src/pages/transaction/components/statusColors/index.tsx
View file @
f77a49f5
...
...
@@ -89,7 +89,17 @@ const matchStatusColor = (status: number): string => {
const
StatusColors
:
React
.
FC
<
StatusColorsProps
>
=
(
props
)
=>
{
const
{
status
,
type
,
text
=
null
}
=
props
const
statusShowColor
=
matchStatusColor
(
status
)
return
(<
Tag
color=
{
statusShowColor
}
>
{
text
}
</
Tag
>)
// return (<Tag color={statusShowColor} style={{whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{text}</Tag>)
return
(<
p
style=
{
{
width
:
100
,
whiteSpace
:
'nowrap'
,
overflow
:
'hidden'
,
textOverflow
:
'ellipsis'
,
// backgroundColor: '#ef6260',
padding
:
'0 7px'
,
// borderRadius: '2px',
// color: 'white'
}
}
title=
{
text
}
>
{
text
}
</
p
>)
}
StatusColors
.
defaultProps
=
{}
...
...
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