Commit e0f54058 authored by Bill's avatar Bill

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

parent f9a29d58
...@@ -59,7 +59,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => { ...@@ -59,7 +59,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
<div className={styles.infoContainer}> <div className={styles.infoContainer}>
<div className={styles.info}> <div className={styles.info}>
<div className={styles.header}> <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}> <div className={styles.tags}>
<Space> <Space>
<StatusTag type="default" title={templateName} /> <StatusTag type="default" title={templateName} />
......
...@@ -10,10 +10,11 @@ import styles from './index.less'; ...@@ -10,10 +10,11 @@ import styles from './index.less';
import SwapCoupon from './swapCoupon'; import SwapCoupon from './swapCoupon';
import SwapProduct from './swapProduct'; import SwapProduct from './swapProduct';
import { getIntl } from 'umi' import { getIntl } from 'umi'
import { GetMarketingAdornActivityGoodsAdornResponse } from '@/services/MarketingV2Api';
const intl = getIntl(); const intl = getIntl();
const { TabPane } = Tabs; const { TabPane } = Tabs;
interface Iprops { interface Iprops extends GetMarketingAdornActivityGoodsAdornResponse {
className: string, className: string,
children: React.ReactNode, children: React.ReactNode,
title: string, title: string,
...@@ -108,11 +109,16 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => { ...@@ -108,11 +109,16 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
const { const {
productName: name, productImgUrl: image, mode = "horizontal", productName: name, productImgUrl: image, mode = "horizontal",
price: originalPrice, price: originalPrice,
/** 折扣(如85折,输入85,9折输入90) */
discount, discount,
// 活动价格团购价格秒杀价格单位定金砍价底价
activityPrice, activityPrice,
activityList, activityList,
activityId, activityId,
/** 直降价格起始价格 */
plummetPrice, plummetPrice,
/** 定金抵扣单价 */
deductionPrice,
...otherRestProps ...otherRestProps
} = rest as any; } = rest as any;
const activityLabel = activityList?.find((_item) => _item.id === activityId); const activityLabel = activityList?.find((_item) => _item.id === activityId);
...@@ -123,14 +129,14 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => { ...@@ -123,14 +129,14 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
mode, mode,
...withLabel, ...withLabel,
originalPrice: originalPrice, originalPrice: originalPrice,
discountPrice: discount || activityPrice || plummetPrice discountPrice: activityPrice || plummetPrice || plummetPrice || deductionPrice
}; };
const verticalData = { const verticalData = {
name, name,
image, image,
mode, mode,
discountPrice: discount || activityPrice || plummetPrice, discountPrice: activityPrice || plummetPrice || plummetPrice || deductionPrice,
buyBtn: false, buyBtn: false,
...withLabel, ...withLabel,
sold: 0 sold: 0
......
...@@ -120,8 +120,8 @@ const ActivePage = () => { ...@@ -120,8 +120,8 @@ const ActivePage = () => {
templateName={_item.templateName} templateName={_item.templateName}
statusName={_item.statusName} statusName={_item.statusName}
shopName={_item.shopName} shopName={_item.shopName}
startTime={_item.startTime} startTime={_item.startTime as unknown as string}
endTime={_item.endTime} endTime={_item.endTime as unknown as string}
environment={_item.environment} environment={_item.environment}
status={_item.status} status={_item.status}
onRemove={handleRemove} 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