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
XieZhiXiong
jinfa-platform
Commits
22d27c2a
Commit
22d27c2a
authored
Feb 28, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改营销能力翻译bug 20843
parent
71df50a9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
3 deletions
+6
-3
selfManagement.ts
src/locales/en-US/marketingAbility/selfManagement.ts
+1
-0
selfManagement.ts
src/locales/ko-KR/marketingAbility/selfManagement.ts
+1
-0
selfManagement.ts
src/locales/zh-CN/marketingAbility/selfManagement.ts
+1
-0
constants.tsx
src/pages/transaction/marketingAbility/common/constants.tsx
+2
-2
index.tsx
...ement/readySubmitExamine/components/rulesLayout/index.tsx
+1
-1
No files found.
src/locales/en-US/marketingAbility/selfManagement.ts
View file @
22d27c2a
...
...
@@ -270,4 +270,5 @@ export default {
'selfManagement.qingshuruId'
:
'Please enter id'
,
"selfManagement.bixudayu0zuiduobaoliu3wei"
:
"Keep a maximum of 3 decimal places, which is greater than 0 and cannot be empty"
,
"selfManagement.rejectmin1"
:
"Keep a maximum of 1 decimal place, greater than 0 and less than 100, and cannot be empty"
,
"selfManagement.di"
:
'The First'
,
}
src/locales/ko-KR/marketingAbility/selfManagement.ts
View file @
22d27c2a
...
...
@@ -270,4 +270,5 @@ export default {
'selfManagement.qingshuruId'
:
'id를 입력하십시오.'
,
"selfManagement.bixudayu0zuiduobaoliu3wei"
:
"최대 3자리의 소수를 0보다 크게 유지하며 비워둘 수 없습니다."
,
"selfManagement.rejectmin1"
:
"0보다 크고 100보다 작은 소수 자릿수를 최대 1자리까지 유지하며 null이 될 수 없습니다."
,
"selfManagement.di"
:
'제'
,
}
src/locales/zh-CN/marketingAbility/selfManagement.ts
View file @
22d27c2a
...
...
@@ -270,4 +270,5 @@ export default {
'selfManagement.qingshuruId'
:
'请输入id'
,
"selfManagement.bixudayu0zuiduobaoliu3wei"
:
"最多保留3位小数,大于0,不可为空"
,
"selfManagement.rejectmin1"
:
"最多保留1位小数,大于0且小于100,不可为空"
,
"selfManagement.di"
:
'第'
,
}
src/pages/transaction/marketingAbility/common/constants.tsx
View file @
22d27c2a
...
...
@@ -119,13 +119,13 @@ export const GeneralEffect = (int, data) => {
{
(
int
===
5
&&
data
.
type
===
2
)
&&
`${intl.formatMessage({ id: 'marketingAbility.fullFold'})}`
}
</>,
extra
:
<>
{
(
int
===
4
&&
data
.
type
===
1
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.jian' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.jian
delete
' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
4
&&
data
.
type
===
2
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${item.key} ${intl.formatMessage({ id: 'marketingAbility.ge' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.value / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
5
&&
data
.
type
===
1
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.jian' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.jian
delete
' })} ${Number(item.value).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
5
&&
data
.
type
===
2
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`${intl.formatMessage({ id: 'marketingAbility.man' })} ${Number(item.key).toFixed(2)} ${intl.formatMessage({ id: 'marketingAbility.yuan' })}, ${intl.formatMessage({ id: 'marketingAbility.da' })} ${item.value / 10} ${intl.formatMessage({ id: 'marketingAbility.zhe' })}`
}
</
div
>))
}
...
...
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/components/rulesLayout/index.tsx
View file @
22d27c2a
...
...
@@ -344,7 +344,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
required
>
{
fields
.
map
(({
key
,
name
,
fieldKey
,
...
restField
})
=>
(
<
Space
key=
{
key
}
style=
{
{
display
:
'flex'
,
marginBottom
:
8
}
}
align=
"center"
>
{
intl
.
formatMessage
({
id
:
'selfManagement.
full
'
})
}
<
Form
.
Item
<
Space
key=
{
key
}
style=
{
{
display
:
'flex'
,
marginBottom
:
8
}
}
align=
"center"
>
{
intl
.
formatMessage
({
id
:
'selfManagement.
di
'
})
}
<
Form
.
Item
{
...
restField
}
style=
{
{
margin
:
0
}
}
name=
{
[
name
,
`${int === ACTIVITY_TYPE_7 ? 'num' : 'key'}`
]
}
...
...
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