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
shenshaokai
jinfa-platform
Commits
e06ca8fa
Commit
e06ca8fa
authored
Nov 18, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改平台&商家营销活动BUG
parent
4284e206
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
constants.tsx
src/pages/transaction/marketingAbility/common/constants.tsx
+3
-3
add.tsx
.../marketingAbility/paltformSign/readySubmitExamine/add.tsx
+1
-1
index.tsx
...nsaction/marketingAbility/selfManagement/detail/index.tsx
+1
-1
add.tsx
...arketingAbility/selfManagement/readySubmitExamine/add.tsx
+1
-1
No files found.
src/pages/transaction/marketingAbility/common/constants.tsx
View file @
e06ca8fa
...
...
@@ -119,13 +119,13 @@ export const GeneralEffect = (int, data) => {
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.key} 个, 减 ${Number(item.value).toFixed(2)} 元`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
4
&&
data
.
type
===
2
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.key} 个, 打 ${item.value} 折`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.key} 个, 打 ${item.value
/ 10
} 折`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
5
&&
data
.
type
===
1
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${Number(item.key).toFixed(2)} 元, 减 ${Number(item.value).toFixed(2)} 元`
}
</
div
>))
}
</
Space
>
}
{
(
int
===
5
&&
data
.
type
===
2
)
&&
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${Number(item.key).toFixed(2)} 元, 打 ${item.value} 折`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${Number(item.key).toFixed(2)} 元, 打 ${item.value
/ 10
} 折`
}
</
div
>))
}
</
Space
>
}
</>
},
...
...
@@ -191,7 +191,7 @@ export const GeneralEffect = (int, data) => {
col
:
[
{
label
:
'优惠规则'
,
extra
:
<
Space
direction=
'vertical'
>
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.discount} 件, 打 ${item.num} 折`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.discount} 件, 打 ${item.num
/ 10
} 折`
}
</
div
>))
}
</
Space
>
},
{
...
...
src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/add.tsx
View file @
e06ca8fa
...
...
@@ -15,7 +15,7 @@ import DemandLayout from '../../components/demandLayout';
import
{
isEmpty
}
from
'lodash'
;
import
{
SaveOutlined
}
from
'@ant-design/icons'
;
import
ProductListLayout
from
'../../components/productListLayout'
;
import
{
getMarketingPlatformActivitySignupDetail
,
postMarketingPlatformActivitySignupGetFilterSkuId
,
postMarketingPlatformActivitySignupSave
,
postMarketingPlatformActivitySignupUpdate
}
from
'@/services/MarketingV2Api'
;
import
{
getMarketingPlatformActivitySignupDetail
,
getMarketingPlatformActivitySignupDetailGoodsPage
,
postMarketingPlatformActivitySignupGetFilterSkuId
,
postMarketingPlatformActivitySignupSave
,
postMarketingPlatformActivitySignupUpdate
}
from
'@/services/MarketingV2Api'
;
const
TABLINK
=
[
{
id
:
'progressLayout'
,
title
:
'流转进度'
},
...
...
src/pages/transaction/marketingAbility/selfManagement/detail/index.tsx
View file @
e06ca8fa
...
...
@@ -21,7 +21,7 @@ import ListModalLayout from '../../components/listModalLayout';
import
CouponsListLayout
from
'../../components/couponsListLayout'
;
import
{
remindLayout
,
RemindLayoutProps
}
from
'@/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind'
;
import
PrizeList
from
'./prizeList'
;
import
{
getMarketingMerchantActivityDetail
,
postMarketingMerchantActivityExamineStep1
,
postMarketingMerchantActivityExamineStep2
}
from
'@/services/MarketingV2Api'
;
import
{
getMarketingMerchantActivityDetail
,
getMarketingMerchantActivityDetailGoodsPage
,
postMarketingMerchantActivityExamineStep1
,
postMarketingMerchantActivityExamineStep2
}
from
'@/services/MarketingV2Api'
;
const
DetialLayout
=
()
=>
{
const
{
query
:
{
id
},
pathname
}
=
history
.
location
;
...
...
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/add.tsx
View file @
e06ca8fa
...
...
@@ -11,7 +11,7 @@ import ProductListLayout from '../../components/productListLayout';
import
PartakeUserLayout
from
'./components/partakeUserLayout'
;
import
PrizeListLayout
from
'./components/prizeListLayout'
;
import
moment
from
'moment'
;
import
{
getMarketingMerchantActivityDetail
,
postMarketingMerchantActivityGetFilterSkuId
,
postMarketingMerchantActivitySave
,
postMarketingMerchantActivityUpdate
}
from
'@/services/MarketingV2Api'
;
import
{
getMarketingMerchantActivityDetail
,
getMarketingMerchantActivityDetailGoodsPage
,
postMarketingMerchantActivityGetFilterSkuId
,
postMarketingMerchantActivitySave
,
postMarketingMerchantActivityUpdate
}
from
'@/services/MarketingV2Api'
;
const
layout
:
any
=
{
colon
:
false
,
...
...
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