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
e0f54058
Commit
e0f54058
authored
Dec 28, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改商家活动页跳转详情路径
parent
f9a29d58
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
index.tsx
...esManagement/activePage/components/ActivityItem/index.tsx
+1
-1
index.tsx
...ePage/fixtures/components/Layouts/CommodityList/index.tsx
+9
-3
index.tsx
...bility/marketingActivitiesManagement/activePage/index.tsx
+2
-2
No files found.
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/ActivityItem/index.tsx
View file @
e0f54058
...
...
@@ -59,7 +59,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
<
div
className=
{
styles
.
infoContainer
}
>
<
div
className=
{
styles
.
info
}
>
<
div
className=
{
styles
.
header
}
>
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage/management/view?id=${id}`
}
>
{
title
}
</
Link
></
div
>
<
Link
to=
{
`/memberCenter/marketingAbility/activityPage
s
/management/view?id=${id}`
}
>
{
title
}
</
Link
></
div
>
<
div
className=
{
styles
.
tags
}
>
<
Space
>
<
StatusTag
type=
"default"
title=
{
templateName
}
/>
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/index.tsx
View file @
e0f54058
...
...
@@ -10,10 +10,11 @@ import styles from './index.less';
import
SwapCoupon
from
'./swapCoupon'
;
import
SwapProduct
from
'./swapProduct'
;
import
{
getIntl
}
from
'umi'
import
{
GetMarketingAdornActivityGoodsAdornResponse
}
from
'@/services/MarketingV2Api'
;
const
intl
=
getIntl
();
const
{
TabPane
}
=
Tabs
;
interface
Iprops
{
interface
Iprops
extends
GetMarketingAdornActivityGoodsAdornResponse
{
className
:
string
,
children
:
React
.
ReactNode
,
title
:
string
,
...
...
@@ -108,11 +109,16 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
const
{
productName
:
name
,
productImgUrl
:
image
,
mode
=
"horizontal"
,
price
:
originalPrice
,
/** 折扣(如85折,输入85,9折输入90) */
discount
,
// 活动价格团购价格秒杀价格单位定金砍价底价
activityPrice
,
activityList
,
activityId
,
/** 直降价格起始价格 */
plummetPrice
,
/** 定金抵扣单价 */
deductionPrice
,
...
otherRestProps
}
=
rest
as
any
;
const
activityLabel
=
activityList
?.
find
((
_item
)
=>
_item
.
id
===
activityId
);
...
...
@@ -123,14 +129,14 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
mode
,
...
withLabel
,
originalPrice
:
originalPrice
,
discountPrice
:
discount
||
activityPrice
||
plummet
Price
discountPrice
:
activityPrice
||
plummetPrice
||
plummetPrice
||
deduction
Price
};
const
verticalData
=
{
name
,
image
,
mode
,
discountPrice
:
discount
||
activityPrice
||
plummet
Price
,
discountPrice
:
activityPrice
||
plummetPrice
||
plummetPrice
||
deduction
Price
,
buyBtn
:
false
,
...
withLabel
,
sold
:
0
...
...
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.tsx
View file @
e0f54058
...
...
@@ -120,8 +120,8 @@ const ActivePage = () => {
templateName=
{
_item
.
templateName
}
statusName=
{
_item
.
statusName
}
shopName=
{
_item
.
shopName
}
startTime=
{
_item
.
startTime
}
endTime=
{
_item
.
endTime
}
startTime=
{
_item
.
startTime
as
unknown
as
string
}
endTime=
{
_item
.
endTime
as
unknown
as
string
}
environment=
{
_item
.
environment
}
status=
{
_item
.
status
}
onRemove=
{
handleRemove
}
...
...
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