Skip to content

J
jinfa-platform
Commit fd2b8dff authored by unknown's avatar unknown
Browse files
Options

activityPage

parent 2a1749b7
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 138 deletions
src/locales/zh-CN.ts
View file @ fd2b8dff
......@@ -12,7 +12,7 @@ import editor from './zh-CN/editor'
import authConfig from './zh-CN/system/authConfig'
import systemSetting from './zh-CN/system/systemSetting'
import accountSetting from './zh-CN/system/accountSetting'
import activityPages from './zh-CN/marketingAbility/activityPages'
import activityPage from './zh-CN/marketingAbility/activityPage'
import merchantCoupon from './zh-CN/marketingAbility/merchantCoupon'
import content from './zh-CN/content'
import commodity from './zh-CN/commodity'
......@@ -38,7 +38,7 @@ export default {
...authConfig,
...systemSetting,
...accountSetting,
...activityPages,
...activityPage,
...merchantCoupon,
...content,
}
src/locales/zh-CN/marketingAbility/activityPage.ts 0 → 100644
View file @ fd2b8dff
// 营销能力 商家营销活动页管理
export default {
'activityPage.inputActivityTemplate':'请填写活动模板',
'activityPage.activityPageaveOK':'活动页保存成功',
'activityPage.ifDecoration':'是否立即装修活动页',
'activityPage.decorationImmediate':'立即装修',
'activityPage.waitMin':'稍后',
'activityPage.decorationActivityPage':'修改活动页',
'activityPage.lookActivityPage':'查看活动页',
'activityPage.addActivityPage':'新增活动页',
'activityPage.activityPageDecorate':'活动页装修',
'activityPage.save':'保存',
'activityPage.baseInfo':'基本信息',
'activityPage.suitMark':'适用商城',
'activityPage.StartValidityPeriod':'有效期开始',
'activityPage.endValidityPeriod':'有效期结束',
'activityPage.ifConfirmDelete':'确定删除吗？',
'activityPage.chooseActivityTemplate':'选择活动模板',
'activityPage.chooseActivityProduct':'选择活动商品',
'activityPage.couponInfo':'优惠券信息',
'activityPage.typeName':'类型',
'activityPage.getWayName':'领券方式',
'activityPage.denomination':'面额',
'activityPage.condition':'使用条件',
'activityPage.fill':'满',
'activityPage.yuanUse':'元使用',
'activityPage.time':'有效期',
'activityPage.belong':'所属',
'activityPage.platform':'平台',
'activityPage.shoper':'商家',
'activityPage.SearchCouponID':'搜索优惠券ID',
'activityPage.inputCouponIDSearch':'输入优惠券ID进行搜索',
'activityPage.CouponName':'优惠券名称',
'activityPage.search':'查询',
'activityPage.chooseCoupon':'选择优惠券',
'activityPage.content':'内容',
'activityPage.uploadPic':'上传图片',
'activityPage.advertisingMap':'广告图',
'activityPage.id':'优惠券ID',
'activityPage.couponTypeName':'优惠券类型',
'activityPage.useConditionMoney':'使用条件',
'activityPage.to':'至',
'activityPage.activityPic':'活动图片',
'activityPage.fill300remove20':'满300减20',
'activityPage.allClothes':'套装',
'activityPage.yuan':'元',
'activityPage.piece':'件',
'activityPage.giveCoupon':'赠优惠券',
'activityPage.receive':'获赠',
'activityPage.available':'可使用',
'activityPage.complimentaryGoods':'赠商品',
'activityPage.give':'赠送',
'activityPage.originalPrice':'原价',
'activityPage.buyNow':'立即抢购',
'activityPage.availableUse':'可用',
'activityPage.coupon':'优惠券',
'activityPage.customArea':'自定义区域',
'activityPage.lengthbetween16and32':'输入字符长度不能大于32个字符或16个汉字',
'activityPage.activityTag':'活动标签',
'activityPage.addTag':'新增标签',
'activityPage.commodityActivities':'商品活动',
'activityPage.confirmLeaveDecoratePage':'确认离开装修页?',
'activityPage.editingShopActivityPage':'正在编辑：商家营销活动页',
'activityPage.alreadyAdd':'已添加',
'activityPage.allModules':'全部模块',
'activityPage.add':'新增',
'activityPage.searchshousuo':'搜索'
}
\ No newline at end of file
src/locales/zh-CN/marketingAbility/activityPages.ts deleted 100644 → 0
View file @ 2a1749b7
// 营销能力 商家营销活动页管理
export default {
'activityPages.inputActivityTemplate':'请填写活动模板',
'activityPages.activityPageSaveOK':'活动页保存成功',
'activityPages.ifDecoration':'是否立即装修活动页',
'activityPages.decorationImmediate':'立即装修',
'activityPages.waitMin':'稍后',
'activityPages.decorationActivityPage':'修改活动页',
'activityPages.lookActivityPage':'查看活动页',
'activityPages.addActivityPage':'新增活动页',
'activityPages.activityPageDecorate':'活动页装修',
'activityPages.save':'保存',
'activityPages.baseInfo':'基本信息',
'activityPages.suitMark':'适用商城',
'activityPages.StartValidityPeriod':'有效期开始',
'activityPages.endValidityPeriod':'有效期结束',
'activityPages.ifConfirmDelete':'确定删除吗？',
'activityPages.chooseActivityTemplate':'选择活动模板',
'activityPages.chooseActivityProduct':'选择活动商品',
'activityPages.couponInfo':'优惠券信息',
'activityPages.typeName':'类型',
'activityPages.getWayName':'领券方式',
'activityPages.denomination':'面额',
'activityPages.condition':'使用条件',
'activityPages.fill':'满',
'activityPages.yuanUse':'元使用',
'activityPages.time':'有效期',
'activityPages.belong':'所属',
'activityPages.platform':'平台',
'activityPages.shoper':'商家',
'activityPages.SearchCouponID':'搜索优惠券ID',
'activityPages.inputCouponIDSearch':'输入优惠券ID进行搜索',
'activityPages.CouponName':'优惠券名称',
'activityPages.search':'查询',
'activityPages.chooseCoupon':'选择优惠券',
'activityPages.content':'内容',
'activityPages.uploadPic':'上传图片',
'activityPages.advertisingMap':'广告图',
'activityPages.id':'优惠券ID',
'activityPages.couponTypeName':'优惠券类型',
'activityPages.useConditionMoney':'使用条件',
'activityPages.to':'至',
'activityPages.activityPic':'活动图片',
'activityPages.fill300remove20':'满300减20',
'activityPages.allClothes':'套装',
'activityPages.yuan':'元',
'activityPages.piece':'件',
'activityPages.giveCoupon':'赠优惠券',
'activityPages.receive':'获赠',
'activityPages.available':'可使用',
'activityPages.complimentaryGoods':'赠商品',
'activityPages.give':'赠送',
'activityPages.originalPrice':'原价',
'activityPages.buyNow':'立即抢购',
'activityPages.availableUse':'可用',
'activityPages.coupon':'优惠券',
'activityPages.customArea':'自定义区域',
'activityPages.lengthbetween16and32':'输入字符长度不能大于32个字符或16个汉字',
'activityPages.activityTag':'活动标签',
'activityPages.addTag':'新增标签',
'activityPages.commodityActivities':'商品活动',
'activityPages.confirmLeaveDecoratePage':'确认离开装修页?',
'activityPages.editingShopActivityPage':'正在编辑：商家营销活动页',
'activityPages.alreadyAdd':'已添加',
'activityPages.allModules':'全部模块',
'activityPages.add':'新增',
'activityPages.searchshousuo':'搜索'
}
\ No newline at end of file
src/locales/zh-CN/system/authConfig.ts
View file @ fd2b8dff
......@@ -52,7 +52,10 @@ export default {
"authConfig.origanCode": "组织代码",
"authConfig.origanJiGou": "组织机构",
"authConfig.loginAccount": "登录账号",
'authConfig.inputbetween6and20':'请输入由数字字母或者下划线组成的6-20位账号',
"authConfig.loginPsw": "登录密码",
'authConfig.input8Psw':'请输入由大小写字母和数字组成的8位密码',
'authConfig.personName':'姓名',
"authConfig.tel": "手机号",
"authConfig.correntTel": "请输入正确的手机号",
"authConfig.indentifyCode": "身份证号",
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/add/index.tsx
View file @ fd2b8dff
......@@ -56,7 +56,7 @@ const Add = () => {
const onSubmit = async (values: SubmitType) => {
const { template, startTime, endTime, ...rest } = values;
if (!template?.templateId) {
message.error(intl.formatMessage({ id: 'activityPages.inputActivityTemplate' }));
message.error(intl.formatMessage({ id: 'activityPage.inputActivityTemplate' }));
return;
}
console.log(startTime);
......@@ -80,13 +80,13 @@ const Add = () => {
if (code === 1000) {
if (!isEdit && !isView) {
Modal.confirm({
title: <span className={styles.modalTitle}>{intl.formatMessage({ id: 'activityPages.activityPageSaveOK' })}</span>,
title: <span className={styles.modalTitle}>{intl.formatMessage({ id: 'activityPage.activityPageaveOK' })}</span>,
icon: <CheckCircleOutlined twoToneColor="#52c41a" />,
content: <span className={styles.modalContent}>{intl.formatMessage({ id: 'activityPages.ifDecoration' })}？</span>,
okText: intl.formatMessage({ id: 'activityPages.decorationImmediate' }),
cancelText: intl.formatMessage({ id: 'activityPages.waitMin' }),
content: <span className={styles.modalContent}>{intl.formatMessage({ id: 'activityPage.ifDecoration' })}？</span>,
okText: intl.formatMessage({ id: 'activityPage.decorationImmediate' }),
cancelText: intl.formatMessage({ id: 'activityPage.waitMin' }),
onOk: () => {
history.push(`/memberCenter/marketingAbility/activityPages/management/fixtures?id=${data}`);
history.push(`/memberCenter/marketingAbility/activityPage/management/fixtures?id=${data}`);
},
onCancel: () => {
history.goBack();
......@@ -156,12 +156,12 @@ const Add = () => {
const renderTitle = () => {
if (isEdit) {
return intl.formatMessage({ id: 'activityPages.decorationActivityPage' });
return intl.formatMessage({ id: 'activityPage.decorationActivityPage' });
}
if (isView) {
return intl.formatMessage({ id: 'activityPages.lookActivityPage' });
return intl.formatMessage({ id: 'activityPage.lookActivityPage' });
}
return intl.formatMessage({ id: 'activityPages.addActivityPage' });
return intl.formatMessage({ id: 'activityPage.addActivityPage' });
};
return (
......@@ -174,19 +174,19 @@ const Add = () => {
<Space>
{
isEdit && (
<Link to={`/memberCenter/marketingAbility/activityPages/management/fixtures?id=${id}`}>
<Button icon={<BgColorsOutlined />}>{intl.formatMessage({ id: 'activityPages.activityPageDecorate' })}</Button>
<Link to={`/memberCenter/marketingAbility/activityPage/management/fixtures?id=${id}`}>
<Button icon={<BgColorsOutlined />}>{intl.formatMessage({ id: 'activityPage.activityPageDecorate' })}</Button>
</Link>
) || null
}
<Button icon={<SaveOutlined />} loading={loading} onClick={() => actions.submit()} type="primary">{intl.formatMessage({ id: 'activityPages.save' })}</Button>
<Button icon={<SaveOutlined />} loading={loading} onClick={() => actions.submit()} type="primary">{intl.formatMessage({ id: 'activityPage.save' })}</Button>
</Space>
)
}
>
<div className={styles.card}>
<div className={styles.title}>{intl.formatMessage({ id: 'activityPages.baseInfo' })}</div>
<div className={styles.title}>{intl.formatMessage({ id: 'activityPage.baseInfo' })}</div>
<NiceForm
onSubmit={onSubmit}
schema={schema}
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/ActivityItem/index.tsx
View file @ fd2b8dff
......@@ -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/activityPages/management/view?id=${id}`}>{title}</Link></div>
<Link to={`/memberCenter/marketingAbility/activityPage/management/view?id=${id}`}>{title}</Link></div>
<div className={styles.tags}>
<Space>
<StatusTag type="default" title={templateName} />
......@@ -67,12 +67,12 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
</Space>
</div>
<div className={styles.mall}>
<span className={styles.label}>{intl.formatMessage({ id: 'activityPages.suitMark' })}：</span>
<span className={styles.label}>{intl.formatMessage({ id: 'activityPage.suitMark' })}：</span>
<span>{shopName}</span>
</div>
<div className={styles.time}>
<span className={styles.startTime}>{intl.formatMessage({ id: 'activityPages.StartValidityPeriod' })}：{startTime && moment(startTime).format(format)}</span>
<span>{intl.formatMessage({ id: 'activityPages.endValidityPeriod' })}：{endTime && moment(endTime).format(format)}</span>
<span className={styles.startTime}>{intl.formatMessage({ id: 'activityPage.StartValidityPeriod' })}：{startTime && moment(startTime).format(format)}</span>
<span>{intl.formatMessage({ id: 'activityPage.endValidityPeriod' })}：{endTime && moment(endTime).format(format)}</span>
</div>
</div>
......@@ -82,14 +82,14 @@ const ActiveItem: React.FC<Iprops> = (props: Iprops) => {
</div>
{
[PENDIGN_ONLINE, OFFLINE].includes(status) && (
<Link to={`/memberCenter/marketingAbility/activityPages/management/edit?id=${id}`}>
<Link to={`/memberCenter/marketingAbility/activityPage/management/edit?id=${id}`}>
<Button icon={<EditOutlined />}></Button>
</Link>
) || null
}
{
status === PENDIGN_ONLINE && (
<Popconfirm placement="topLeft" title={intl.formatMessage({ id: 'activityPages.ifConfirmDelete' })} onConfirm={handleRemove} okText={intl.formatMessage({ id: 'common.button.confirm' })} cancelText={intl.formatMessage({ id: 'common.button.cancel' })}>
<Popconfirm placement="topLeft" title={intl.formatMessage({ id: 'activityPage.ifConfirmDelete' })} onConfirm={handleRemove} okText={intl.formatMessage({ id: 'common.button.confirm' })} cancelText={intl.formatMessage({ id: 'common.button.cancel' })}>
<Button icon={<DeleteOutlined />}></Button>
</Popconfirm>
)
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/components/TemplateDrawer/index.tsx
View file @ fd2b8dff
......@@ -96,7 +96,7 @@ const TemplateDrawer: React.FC<Iprops> = (props: Iprops) => {
return (
<Drawer
title={intl.formatMessage({ id: 'activityPages.chooseActivityTemplate' })}
title={intl.formatMessage({ id: 'activityPage.chooseActivityTemplate' })}
width={800}
onClose={handleCancel}
visible={visible}
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/ActivityAreaSetting/activityProductDrawer.tsx
View file @ fd2b8dff
......@@ -242,7 +242,7 @@ const ActivityProductDrawer: React.FC<Iprops> = (props: Iprops) => {
headerStyle={drawerStyle}
bodyStyle={drawerStyle}
footerStyle={drawerStyle}
title={intl.formatMessage({ id: 'activityPages.chooseActivityProduct' })}
title={intl.formatMessage({ id: 'activityPage.chooseActivityProduct' })}
visible={visible}
width={950}
destroyOnClose
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/CouponSelect/index.tsx
View file @ fd2b8dff
......@@ -41,7 +41,7 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
const columns = [
{
title: intl.formatMessage({ id: 'activityPages.couponInfo' }),
title: intl.formatMessage({ id: 'activityPage.couponInfo' }),
dataIndex: 'couponInfo',
render: (_text, _record) => {
const isPlatform = _record.belongType === 1;
......@@ -60,15 +60,15 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
}
},
{
title: intl.formatMessage({ id: 'activityPages.typeName' }),
title: intl.formatMessage({ id: 'activityPage.typeName' }),
dataIndex: 'typeName',
},
{
title: intl.formatMessage({ id: 'activityPages.getWayName' }),
title: intl.formatMessage({ id: 'activityPage.getWayName' }),
dataIndex: 'getWayName'
},
{
title: intl.formatMessage({ id: 'activityPages.denomination' }),
title: intl.formatMessage({ id: 'activityPage.denomination' }),
dataIndex: 'denomination',
render: (_text, _record) => {
return (
......@@ -79,16 +79,16 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
}
},
{
title: intl.formatMessage({ id: 'activityPages.condition' }),
title: intl.formatMessage({ id: 'activityPage.condition' }),
dataIndex: 'condition',
render: (text, _record) => {
return (
<span>{`${intl.formatMessage({ id: 'activityPages.fill' })} ${_record.useConditionMoney} ${intl.formatMessage({ id: 'activityPages.yuanUse' })}`}</span>
<span>{`${intl.formatMessage({ id: 'activityPage.fill' })} ${_record.useConditionMoney} ${intl.formatMessage({ id: 'activityPage.yuanUse' })}`}</span>
);
}
},
{
title: intl.formatMessage({ id: 'activityPages.time' }),
title: intl.formatMessage({ id: 'activityPage.time' }),
dataIndex: 'time',
render: (_text, _record) => {
return (
......@@ -108,13 +108,13 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
},
},
{
title: intl.formatMessage({ id: 'activityPages.belong' }),
title: intl.formatMessage({ id: 'activityPage.belong' }),
dataIndex: 'belong',
render: (_text, _record) => {
const isPlatform = _record.belongType === 1;
return (
<Space direction="vertical">
<StatusTag title={isPlatform ? intl.formatMessage({ id: 'activityPages.platform' }) : intl.formatMessage({ id: 'activityPages.shoper' })} type={isPlatform ? 'success' : 'primary'} />
<StatusTag title={isPlatform ? intl.formatMessage({ id: 'activityPage.platform' }) : intl.formatMessage({ id: 'activityPage.shoper' })} type={isPlatform ? 'success' : 'primary'} />
<div className={styles.belong}>{_record.belongName}</div>
</Space>
);
......@@ -139,9 +139,9 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
type: 'string',
'x-component': 'Search',
'x-component-props': {
placeholder: intl.formatMessage({ id: 'activityPages.SearchCouponID' }),
placeholder: intl.formatMessage({ id: 'activityPage.SearchCouponID' }),
align: 'flex-left',
tip: intl.formatMessage({ id: 'activityPages.inputCouponIDSearch' }),
tip: intl.formatMessage({ id: 'activityPage.inputCouponIDSearch' }),
},
},
[FORM_FILTER_PATH]: {
......@@ -155,7 +155,7 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
couponName: {
type: 'string',
"x-component-props": {
placeholder: intl.formatMessage({ id: 'activityPages.CouponName' })
placeholder: intl.formatMessage({ id: 'activityPage.CouponName' })
}
},
submit: {
......@@ -164,7 +164,7 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
span: 1,
},
'x-component-props': {
children: intl.formatMessage({ id: 'activityPages.search' }),
children: intl.formatMessage({ id: 'activityPage.search' }),
},
},
},
......@@ -183,7 +183,7 @@ const CouponSelect: React.FC<Iprops> = React.forwardRef((props: Iprops, couponRe
width={920}
visible={visible}
onClose={onCancel}
title={intl.formatMessage({ id: 'activityPages.chooseCoupon' })}
title={intl.formatMessage({ id: 'activityPage.chooseCoupon' })}
columns={columns}
schema={schema}
onOk={triggerOk}
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/EditPanel/editPanelForm.tsx
View file @ fd2b8dff
......@@ -99,7 +99,7 @@ const EditPanelForm = () => {
const propsMapToValue = {
top: {
imageUrl: [{ name: intl.formatMessage({ id: 'activityPages.advertisingMap' }), url: selectedInfo?.props?.imageUrl }]
imageUrl: [{ name: intl.formatMessage({ id: 'activityPage.advertisingMap' }), url: selectedInfo?.props?.imageUrl }]
},
couponItem: {
coupon: {
......@@ -201,7 +201,7 @@ const EditPanelForm = () => {
const target = value[0];
return (
<div className={styles.image}>
<div className={styles.uploadImage}>{intl.formatMessage({ id: 'activityPages.uploadPic' })}</div>
<div className={styles.uploadImage}>{intl.formatMessage({ id: 'activityPage.uploadPic' })}</div>
<div className={styles.imageIcon}>
<Spin spinning={target?.status === 'uploading'}>
{
......@@ -235,7 +235,7 @@ const EditPanelForm = () => {
<div style={{position: 'relative', width: '400px'}}>
<div className={className}>
<div className={styles.header}>
<span className={styles.title}>{intl.formatMessage({ id: 'activityPages.content' })}</span>
<span className={styles.title}>{intl.formatMessage({ id: 'activityPage.content' })}</span>
<CloseOutlined onClick={handleOnClose} />
</div>
<div className={styles.content}>
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Advertisement/index.tsx
View file @ fd2b8dff
......@@ -32,7 +32,7 @@ const Advertisement: React.FC<Iprops> = (props: Iprops) => {
style={{width: cacheWidth, height: cacheHeight, ...style}}
/>
) || (
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPages.activityPic' })} arrowPointAtCenter>
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPage.activityPic' })} arrowPointAtCenter>
<div style={{width: cacheWidth, height: cacheHeight, ...style}}></div>
</Tooltip>
)
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/index.tsx
View file @ fd2b8dff
......@@ -110,7 +110,7 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
name,
image,
mode,
tags: [intl.formatMessage({ id: 'activityPages.fill300remove20' })],
tags: [intl.formatMessage({ id: 'activityPage.fill300remove20' })],
originalPrice: originalPrice,
discountPrice: discount || activityPrice
};
......@@ -121,7 +121,7 @@ const CommodityItem: React.FC<Iprops> = (props: Iprops) => {
mode,
discountPrice: discount || activityPrice,
buyBtn: false,
tags: [intl.formatMessage({ id: 'activityPages.fill300remove20' })],
tags: [intl.formatMessage({ id: 'activityPage.fill300remove20' })],
sold: 0
};
......@@ -171,7 +171,7 @@ const CommodityTab: React.FC<any> = (props) => {
tags={[{
type: 'purple',
icon: <TagOutlined />,
name: intl.formatMessage({ id: 'activityPages.fill300remove20' })
name: intl.formatMessage({ id: 'activityPage.fill300remove20' })
}]}
buyBtn={false}
// originalPrice={300}
......@@ -185,7 +185,7 @@ const CommodityTab: React.FC<any> = (props) => {
const discountPrice = groupPrice?.toString().split(".");
const allTotal = goodsSubsidiaryGroupDetailsList.reduce((sum, _current) => sum += _current.price, 0);
return (
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPages.allClothes' })}${_index + 1}`}>
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPage.allClothes' })}${_index + 1}`}>
<div className={styles.groupPane}>
{
goodsSubsidiaryGroupDetailsList?.map((_row, _key) => {
......@@ -196,7 +196,7 @@ const CommodityTab: React.FC<any> = (props) => {
image={_row.productImgUrl}
mode="vertical"
footer={<div></div>}
tags={[intl.formatMessage({ id: 'activityPages.fill300remove20' })]}
tags={[intl.formatMessage({ id: 'activityPage.fill300remove20' })]}
style={{padding: '0'}}
></Commodity>
</div>
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/swapCoupon.tsx
View file @ fd2b8dff
......@@ -29,7 +29,7 @@ const SwapCoupon = (props) => {
};
const { productName, productImgUrl, price, giveCouponList, giveType } = restProps;
/** giveType 区分是元还是件 ，1.满额赠，单位元， 2.商品赠，单位件 */
const unit = giveType === 1 ? intl.formatMessage({ id: 'activityPages.yuan' }) : intl.formatMessage({ id: 'activityPages.piece' });
const unit = giveType === 1 ? intl.formatMessage({ id: 'activityPage.yuan' }) : intl.formatMessage({ id: 'activityPage.piece' });
if (isEmpty) {
return (
<div className={cs(styles.commodityGroupEmpty, className)} {...divProps}>
......@@ -47,7 +47,7 @@ const SwapCoupon = (props) => {
image={productImgUrl}
mode="horizontal"
discountPrice={price}
tags={[intl.formatMessage({ id: 'activityPages.giveCoupon' })]}
tags={[intl.formatMessage({ id: 'activityPage.giveCoupon' })]}
buyBtn={true}
/>
</div>
......@@ -57,7 +57,7 @@ const SwapCoupon = (props) => {
giveCouponList?.map((_item, _index) => {
const { groupNo, limitValue, list } = _item;
return (
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPages.fill' })}${limitValue}${unit}${intl.formatMessage({ id: 'activityPages.receive' })}`}>
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPage.fill' })}${limitValue}${unit}${intl.formatMessage({ id: 'activityPage.receive' })}`}>
<div className={styles.groupPane}>
{
list?.map((_row, _key) => {
......@@ -66,7 +66,7 @@ const SwapCoupon = (props) => {
<div className={styles.money}>￥
<span className={styles.num}>{_row.denomination}</span>
</div>
<div className={styles.condition}>{`${intl.formatMessage({ id: 'activityPages.fill' })}${_row.useConditionMoney}${intl.formatMessage({ id: 'activityPages.available' })}`}</div>
<div className={styles.condition}>{`${intl.formatMessage({ id: 'activityPage.fill' })}${_row.useConditionMoney}${intl.formatMessage({ id: 'activityPage.available' })}`}</div>
<div className={styles.couponType}>{_row.couponName}</div>
</div>
);
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/swapProduct.tsx
View file @ fd2b8dff
......@@ -29,7 +29,7 @@ const SwapProduct = (props) => {
};
const { productName, productImgUrl, price, goodsSubsidiaryGroupList, giveType } = restProps;
/** giveType 区分是元还是件 ，1.满额赠，单位元， 2.商品赠，单位件 */
const unit = giveType === 1 ? intl.formatMessage({ id: 'activityPages.yuan' }) : intl.formatMessage({ id: 'activityPages.piece' });
const unit = giveType === 1 ? intl.formatMessage({ id: 'activityPage.yuan' }) : intl.formatMessage({ id: 'activityPage.piece' });
if (isEmpty) {
return (
<div className={cs(styles.commodityGroupEmpty, className)} {...divProps}>
......@@ -47,7 +47,7 @@ const SwapProduct = (props) => {
image={productImgUrl}
mode="horizontal"
discountPrice={price}
tags={[intl.formatMessage({ id: 'activityPages.complimentaryGoods' })]}
tags={[intl.formatMessage({ id: 'activityPage.complimentaryGoods' })]}
buyBtn={false}
/>
</div>
......@@ -57,7 +57,7 @@ const SwapProduct = (props) => {
goodsSubsidiaryGroupList?.map((_item, _index) => {
const { groupNo, limitValue, goodsSubsidiaryGroupDetailsList } = _item;
return (
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPages.fill' })}${limitValue}${unit}${intl.formatMessage({ id: 'activityPages.give' })}`}>
<TabPane key={_item.groupNo.toString()} tab={`${intl.formatMessage({ id: 'activityPage.fill' })}${limitValue}${unit}${intl.formatMessage({ id: 'activityPage.give' })}`}>
<div className={styles.groupPane}>
{
goodsSubsidiaryGroupDetailsList?.map((_row, _key) => {
......@@ -67,7 +67,7 @@ const SwapProduct = (props) => {
<img src={_row.productImgUrl} />
<div className={styles.num}>x{_row.num}</div>
</div>
<CustomizeTag>{intl.formatMessage({ id: 'activityPages.originalPrice' })}{`${_row.price}`}{intl.formatMessage({ id: 'activityPages.yuan' })}</CustomizeTag>
<CustomizeTag>{intl.formatMessage({ id: 'activityPage.originalPrice' })}{`${_row.price}`}{intl.formatMessage({ id: 'activityPage.yuan' })}</CustomizeTag>
</div>
);
})
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/CommodityList/tabFooter.tsx
View file @ fd2b8dff
......@@ -22,7 +22,7 @@ const TabFooter: React.FC<Iprops> = (props: Iprops) => {
<span className={styles.originalPrice}>￥{originalPrice.toFixed(2)}</span>
</div>
<div className={styles.button}>
<span>{intl.formatMessage({ id: 'activityPages.buyNow' })}</span>
<span>{intl.formatMessage({ id: 'activityPage.buyNow' })}</span>
</div>
</div>
);
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/Coupon/index.tsx
View file @ fd2b8dff
......@@ -36,7 +36,7 @@ const Coupon: React.FC<Iprops> & { Item: typeof CouponItem } = (props: Iprops) =
<>
{
!!visible && (
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPages.coupon' })} arrowPointAtCenter>
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPage.coupon' })} arrowPointAtCenter>
<div {...divProps} className={classNameStr}>
{children}
</div>
......@@ -83,7 +83,7 @@ const CouponItem: React.FC<ItemIprops> = (props: ItemIprops) => {
return (
<div className={cx(styles.item)}>
<div {...divProps} className={className}>
<CouponsItem money={denomination} isnull={!isNotNull} typeName={typeName} tag={tag} info={`${intl.formatMessage({ id: 'activityPages.fill' })+useConditionMoney+intl.formatMessage({ id: 'activityPages.availableUse' })}`} className={styles.couponItem} />
<CouponsItem money={denomination} isnull={!isNotNull} typeName={typeName} tag={tag} info={`${intl.formatMessage({ id: 'activityPage.fill' })+useConditionMoney+intl.formatMessage({ id: 'activityPage.availableUse' })}`} className={styles.couponItem} />
</div>
</div>
);
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Layouts/WrapCommodityList/index.tsx
View file @ fd2b8dff
......@@ -35,7 +35,7 @@ const WrapCommodityList: React.FC<Iprops> = (props: Iprops) => {
};
return (
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPages.customArea' })} arrowPointAtCenter>
<Tooltip placement="topLeft" title={intl.formatMessage({ id: 'activityPage.customArea' })} arrowPointAtCenter>
<div className={classNameStr} style={{marginTop: '12px', minHeight: '50px'}} {...divProps}>
{
renderComponent()
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/ProductPanel/product.tsx
View file @ fd2b8dff
......@@ -58,7 +58,7 @@ const Product: React.FC<Iprops> = (props: Iprops) => {
const handleInputChange = (e) => {
const inputLabel = e.target.value.replace(/[\u4E00-\u9FA5]/g, "AA");
if (inputLabel.length > 32) {
message.error(intl.formatMessage({ id: 'activityPages.lengthbetween16and32' }));
message.error(intl.formatMessage({ id: 'activityPage.lengthbetween16and32' }));
return
}
setInputValue(e.target.value);
......@@ -102,7 +102,7 @@ const Product: React.FC<Iprops> = (props: Iprops) => {
const renderLabel = () => {
return (
<div className={styles.tagContainer}>
<div className={styles.headerName}>{intl.formatMessage({ id: 'activityPages.activityTag' })}</div>
<div className={styles.headerName}>{intl.formatMessage({ id: 'activityPage.activityTag' })}</div>
<div className={styles.tag}>
{
tags?.map((_item, index) => {
......@@ -129,7 +129,7 @@ const Product: React.FC<Iprops> = (props: Iprops) => {
)}
{!inputVisible && (
<Tag className={styles.addTag} onClick={showInput}>
<PlusOutlined /> {intl.formatMessage({ id: 'activityPages.addTag' })}
<PlusOutlined /> {intl.formatMessage({ id: 'activityPage.addTag' })}
</Tag>
)}
......@@ -167,7 +167,7 @@ const Product: React.FC<Iprops> = (props: Iprops) => {
</div>
</div>
<div className={styles.activity}>
<div className={styles.headerName}>{intl.formatMessage({ id: 'activityPages.commodityActivities' })}</div>
<div className={styles.headerName}>{intl.formatMessage({ id: 'activityPage.commodityActivities' })}</div>
{
activityList?.map((_item) => {
return (
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/components/Toolbar/index.tsx
View file @ fd2b8dff
......@@ -15,7 +15,7 @@ const Toolbar: React.FC<Iprops> = (props: Iprops) => {
const { title, extra } = props;
const goback =() => {
Modal.confirm({
title: intl.formatMessage({ id: 'activityPages.confirmLeaveDecoratePage' }),
title: intl.formatMessage({ id: 'activityPage.confirmLeaveDecoratePage' }),
onOk: () => {
history.goBack()
},
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/index.tsx
View file @ fd2b8dff
......@@ -126,14 +126,14 @@ const Fixtures = () => {
}}
>
<div className={styles['wrapper']}>
<Toolbar title={intl.formatMessage({ id: 'activityPages.editingShopActivityPage' })} extra={<ToolbarSubmit loading={submitLoading} onSubmit={onSave}>保存</ToolbarSubmit>} />
<Toolbar title={intl.formatMessage({ id: 'activityPage.editingShopActivityPage' })} extra={<ToolbarSubmit loading={submitLoading} onSubmit={onSave}>保存</ToolbarSubmit>} />
<div className={styles['content']}>
<div className={styles.tree}>
<Tabs >
<TabPane tab={intl.formatMessage({ id: 'activityPages.alreadyAdd' })} key="1">
<TabPane tab={intl.formatMessage({ id: 'activityPage.alreadyAdd' })} key="1">
<ModuleTree />
</TabPane>
<TabPane tab={intl.formatMessage({ id: 'activityPages.allModules' })} key="2">
<TabPane tab={intl.formatMessage({ id: 'activityPage.allModules' })} key="2">
<div className={styles.module}>
<Module />
</div>
......
src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/index.tsx
View file @ fd2b8dff
......@@ -101,10 +101,10 @@ const ActivePage = () => {
<div className={styles.tablePanenl}>
<div className={styles.header}>
<div className={styles.search}>
<Search placeholder={intl.formatMessage({ id: 'activityPages.searchshousuo' })} onChange={(e) => onChange(e.target.value)} onSearch={handleSearch}/>
<Search placeholder={intl.formatMessage({ id: 'activityPage.searchshousuo' })} onChange={(e) => onChange(e.target.value)} onSearch={handleSearch}/>
</div>
<Link to='/memberCenter/marketingAbility/activityPages/management/add'>
<Button icon={<PlusOutlined />} type="primary">{intl.formatMessage({ id: 'activityPages.add' })}</Button>
<Link to='/memberCenter/marketingAbility/activityPage/management/add'>
<Button icon={<PlusOutlined />} type="primary">{intl.formatMessage({ id: 'activityPage.add' })}</Button>
</Link>
</div>
<Spin spinning={loading} wrapperClassName={styles.body}>
......
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