Commit b9f735c9 authored by Bill's avatar Bill

fix: 修改装修翻译

parent 4a013cdf
......@@ -152,8 +152,8 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
minWidth: '1280px',
}
: {}
// console.log(currentRouter)
return currentRouter.noLayout ? props.children : (
console.log(currentRouter)
return currentRouter?.noLayout ? props.children : (
<ProLayout
pageTitleRender={() => currentRouter ? currentRouter.name : window.location.href}
// contentStyle={{minWidth: '1280px'}}
......
......@@ -86,7 +86,7 @@ const Add = () => {
okText: intl.formatMessage({ id: 'activityPage.decorationImmediate' }),
cancelText: intl.formatMessage({ id: 'activityPage.waitMin' }),
onOk: () => {
history.push(`/memberCenter/marketingAbility/activityPage/management/fixtures?id=${data}`);
history.push(`/memberCenter/marketingAbility/activityPages/management/fixtures?id=${data}`);
},
onCancel: () => {
history.goBack();
......@@ -174,7 +174,7 @@ const Add = () => {
<Space>
{
isEdit && (
<Link to={`/memberCenter/marketingAbility/activityPage/management/fixtures?id=${id}`}>
<Link to={`/memberCenter/marketingAbility/activityPages/management/fixtures?id=${id}`}>
<Button icon={<BgColorsOutlined />}>{intl.formatMessage({ id: 'activityPage.activityPageDecorate' })}</Button>
</Link>
) || null
......
......@@ -82,7 +82,7 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
</div>
{
[PENDIGN_ONLINE, OFFLINE].includes(status) && (
<Link to={`/memberCenter/marketingAbility/activityPage/management/edit?id=${id}`}>
<Link to={`/memberCenter/marketingAbility/activityPages/management/edit?id=${id}`}>
<Button icon={<EditOutlined />}></Button>
</Link>
) || null
......
import React, { CSSProperties, useMemo } from 'react';
import cx from 'classnames';
import { Tooltip } from 'antd';
import { useIntl} from 'umi'
import { getIntl } from 'umi'
const intl = getIntl();
interface Iprops {
imageUrl: string,
width: number | string,
......@@ -12,7 +13,6 @@ interface Iprops {
}
const Advertisement: React.FC<Iprops> = (props: Iprops) => {
const intl = useIntl();
const { imageUrl, width = "100%", height = 176, style = {}, className, ...other } = props;
const cacheWidth = useMemo(() => typeof width === 'number' ? `${width}px` : width, [width]);
const cacheHeight = useMemo(() => typeof height === 'number' ? `${height}px` : height, [height]);
......
......@@ -3,8 +3,9 @@ import { MarketingCard } from '@lingxi-design/ui';
import cx from 'classnames';
import styles from './index.less';
import { Tooltip } from 'antd';
import { useIntl} from 'umi'
import { getIntl } from 'umi'
const intl = getIntl();
const { CouponsItem } = MarketingCard;
interface Iprops {
......@@ -21,7 +22,6 @@ interface Iprops {
}
const Coupon: React.FC<Iprops> & { Item: typeof CouponItem } = (props: Iprops) => {
const intl = useIntl();
const { children, className, visible = true, ...other } = props;
const classNameStr = cx(
styles.container,
......
......@@ -2,15 +2,16 @@
import React, { useState } from 'react';
import cx from 'classnames';
import { Tooltip } from 'antd';
import { useIntl} from 'umi'
import { getIntl } from 'umi'
const intl = getIntl();
interface Iprops {
className: any,
children: any
}
const WrapCommodityList: React.FC<Iprops> = (props: Iprops) => {
const intl = useIntl();
// const intl = useIntl();
const { children, className, ...other } = props;
const classNameStr = cx(className);
......
......@@ -103,7 +103,7 @@ const ActivePage = () => {
<div className={styles.search}>
<Search placeholder={intl.formatMessage({ id: 'activityPage.searchshousuo' })} onChange={(e) => onChange(e.target.value)} onSearch={handleSearch}/>
</div>
<Link to='/memberCenter/marketingAbility/activityPage/management/add'>
<Link to='/memberCenter/marketingAbility/activityPages/management/add'>
<Button icon={<PlusOutlined />} type="primary">{intl.formatMessage({ id: 'activityPage.add' })}</Button>
</Link>
</div>
......
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