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
d91000ae
Commit
d91000ae
authored
Mar 01, 2022
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style: 修复营销活动翻译
parent
5f33098b
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
paltformSign.ts
src/locales/en-US/marketingAbility/paltformSign.ts
+0
-0
paltformSign.ts
src/locales/ko-KR/marketingAbility/paltformSign.ts
+0
-0
paltformSign.ts
src/locales/zh-CN/marketingAbility/paltformSign.ts
+0
-0
index.tsx
...ents/couponsListLayout/components/productLayout/index.tsx
+6
-6
index.tsx
...onents/listModalLayout/components/productLayout/index.tsx
+2
-2
remind.ts
...readySubmitExamine/components/productListLayout/remind.ts
+4
-4
No files found.
src/locales/en-US/marketingAbility/paltformSign.ts
View file @
d91000ae
This diff is collapsed.
Click to expand it.
src/locales/ko-KR/marketingAbility/paltformSign.ts
View file @
d91000ae
This diff is collapsed.
Click to expand it.
src/locales/zh-CN/marketingAbility/paltformSign.ts
View file @
d91000ae
This diff is collapsed.
Click to expand it.
src/pages/transaction/marketingAbility/components/couponsListLayout/components/productLayout/index.tsx
View file @
d91000ae
...
...
@@ -93,7 +93,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
return
Promise
.
reject
(
new
Error
(
remind
.
message
[
4
]));
}
if
(
!
pattern
.
test
(
value
)
&&
remind
.
label
[
2
]
!==
'元'
)
{
return
Promise
.
reject
(
new
Error
(
remind
.
label
[
1
]
+
`${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`
));
activityPage
.
yuan
return
Promise
.
reject
(
new
Error
(
remind
.
label
[
1
]
+
`${intl.formatMessage({ id: 'selfManagement.bixudayu0zuiduobaoliu3wei'})}`
));
}
if
(
!
pattern1
.
test
(
value
)
&&
remind
.
label
[
2
]
===
'元'
)
{
return
Promise
.
reject
(
new
Error
(
remind
.
label
[
1
]
+
`${intl.formatMessage({ id: 'marketingAbility.bixudayu0zuiduobaoliu2weixiaoshu'})}`
));
...
...
@@ -129,10 +129,10 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
<
Col
flex=
'auto'
>
<
div
className=
{
style
.
productLayout_item_title
}
>
{
_item
.
productName
}
</
div
>
<
div
className=
{
style
.
productLayout_item_price
}
>
<
span
>
¥
{
_item
.
price
.
toFixed
(
2
)
}
</
span
>
/
{
_item
.
unit
}
<
span
>
{
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
}
{
_item
.
price
.
toFixed
(
2
)
}
</
span
>
/
{
_item
.
unit
}
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
品类
:
{
_item
.
category
}
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
品牌
:
{
_item
.
brand
}
L
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
{
intl
.
formatMessage
({
id
:
'paltformSign.category'
,
defaultMessage
:
'品类'
})
}
:
{
_item
.
category
}
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
{
intl
.
formatMessage
({
id
:
'paltformSign.brand'
,
defaultMessage
:
'品牌'
})
}
:
{
_item
.
brand
}
L
</
div
>
</
Col
>
</
Row
>
</
div
>
...
...
@@ -142,8 +142,8 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
<
Row
style=
{
{
height
:
'100%'
,
marginLeft
:
10
}
}
wrap=
{
false
}
>
<
Col
flex=
'none'
>
<
div
className=
{
style
.
couponLayout_item_left
}
>
<
p
>
¥
<
span
>
{
_item
.
denomination
}
</
span
></
p
>
<
p
>
满
{
_item
.
useConditionMoney
}{
intl
.
formatMessage
({
id
:
'marketingAbility.yuankeyong'
})
}
</
p
>
<
p
>
{
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
}
<
span
>
{
_item
.
denomination
}
</
span
></
p
>
<
p
>
{
intl
.
formatMessage
({
id
:
'paltformSign.full'
,
defaultMessage
:
'满'
})
}
{
_item
.
useConditionMoney
}{
intl
.
formatMessage
({
id
:
'marketingAbility.yuankeyong'
})
}
</
p
>
</
div
>
</
Col
>
<
Col
flex=
'auto'
style=
{
{
overflow
:
'hidden'
}
}
>
...
...
src/pages/transaction/marketingAbility/components/listModalLayout/components/productLayout/index.tsx
View file @
d91000ae
...
...
@@ -102,7 +102,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
<
div
key=
{
`list_${_index + 1}`
}
>
<
div
className=
{
style
.
productLayout_title
}
>
<
span
className=
{
style
.
productLayout_arrow
}
>
{
remind
.
label
[
3
]
}
{
_index
+
1
}
{
remind
.
label
[
3
]
}
</
span
>
{
!
isPreview
&&
<
DeleteOutlined
onClick=
{
()
=>
onDeletion
(
_index
)
}
/>
}
</
div
>
...
...
@@ -141,7 +141,7 @@ const ProductLayout: React.FC<ProductLayoutProps> = (props: any) => {
<
Col
flex=
'auto'
>
<
div
className=
{
style
.
productLayout_item_title
}
>
{
_item
.
productName
}
</
div
>
<
div
className=
{
style
.
productLayout_item_price
}
>
<
span
>
¥
{
_item
.
price
.
toFixed
(
2
)
}
</
span
>
/
{
_item
.
unit
}
<
span
>
{
intl
.
formatMessage
({
id
:
'common.money'
,
defaultMessage
:
'¥'
})
}
{
_item
.
price
.
toFixed
(
2
)
}
</
span
>
/
{
_item
.
unit
}
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
{
intl
.
formatMessage
({
id
:
'marketingAbility.category'
})
}
:
{
_item
.
category
}
</
div
>
<
div
className=
{
style
.
productLayout_item_info
}
>
{
intl
.
formatMessage
({
id
:
'marketingAbility.brand'
})
}
:
{
_item
.
brand
}
L
</
div
>
...
...
src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind.ts
View file @
d91000ae
...
...
@@ -30,8 +30,8 @@ export const remindLayout = (int, giveType?, giftType?) => {
name
:
'giveValue'
,
value
:
giftType
,
type
:
'limitValue'
,
modalTitle
:
`设置赠品-
${
give
}
赠
${
gift
}
`
,
buttonTitle
:
`添加赠送
${
gift
}
`
,
modalTitle
:
intl
.
formatMessage
({
id
:
'paltformSign.MANE_ZENG'
,
defaultMessage
:
`设置赠品-
${
give
}
赠
${
gift
}
`
},
{
data1
:
give
,
data2
:
gift
})
,
buttonTitle
:
intl
.
formatMessage
({
id
:
'paltformSign.MANE_ZENG1'
,
defaultMessage
:
`添加赠送
${
gift
}
`
},
{
data
:
gift
})
,
listTitle
:
`
${
give
}${
gift
}
`
,
label
:
{
1
:
`
${
intl
.
formatMessage
({
id
:
'paltformSign.preferentialThreshold'
})}
`
,
...
...
@@ -54,9 +54,9 @@ export const remindLayout = (int, giveType?, giftType?) => {
name
:
'swapValue'
,
value
:
FULL_EXCHANGE
,
type
:
'limitValue'
,
modalTitle
:
`设置换购商品-
${
give
}
换购商品`
,
modalTitle
:
intl
.
formatMessage
({
id
:
'paltformSign.FULL_EXCHANGE'
,
defaultMessage
:
`设置换购商品-
${
give
}
换购商品`
},
{
data
:
give
})
,
buttonTitle
:
`
${
intl
.
formatMessage
({
id
:
'paltformSign.addBuyGoods'
})}
`
,
listTitle
:
`
${
give
}
换购商品`
,
listTitle
:
intl
.
formatMessage
({
id
:
'paltformSign.FULL_EXCHANGE1'
,
defaultMessage
:
`
${
give
}
换购商品`
},
{
data
:
give
})
,
label
:
{
1
:
`
${
intl
.
formatMessage
({
id
:
'paltformSign.redemptionThreshold'
})}
`
,
2
:
giveType
===
FULL_EXCHANGE
?
`
${
intl
.
formatMessage
({
id
:
'paltformSign.yuan'
})}
`
:
`
${
intl
.
formatMessage
({
id
:
'paltformSign.a'
})}
`
,
...
...
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