Commit e0f54058 authored by Bill's avatar Bill

fix: 修改商家活动页跳转详情路径

parent f9a29d58
......@@ -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/activityPages/management/view?id=${id}`}>{title}</Link></div>
<div className={styles.tags}>
<Space>
<StatusTag type="default" title={templateName} />
......
......@@ -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 || plummetPrice
discountPrice: activityPrice || plummetPrice || plummetPrice || deductionPrice
};
const verticalData = {
name,
image,
mode,
discountPrice: discount || activityPrice || plummetPrice,
discountPrice: activityPrice || plummetPrice || plummetPrice || deductionPrice,
buyBtn: false,
...withLabel,
sold: 0
......
......@@ -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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment