Commit 7cea348f authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

🐞 fix(营销活动): 修复bug

parent 933c521a
...@@ -79,7 +79,7 @@ const memberCenterRoute = { ...@@ -79,7 +79,7 @@ const memberCenterRoute = {
// ProcurementRoute, // ProcurementRoute,
// // 合同能力 // // 合同能力
// contracRoute, // contracRoute,
AuthConfigRoute, // AuthConfigRoute,
// MemberRoute, // MemberRoute,
// HandlingRoute, // HandlingRoute,
// PayandSettleRoute, // PayandSettleRoute,
......
...@@ -191,7 +191,7 @@ export const GeneralEffect = (int, data) => { ...@@ -191,7 +191,7 @@ export const GeneralEffect = (int, data) => {
col: [ col: [
{ {
label: '优惠规则', extra: <Space direction='vertical'> label: '优惠规则', extra: <Space direction='vertical'>
{data.ladderBOList.map(item => (<div>{`满 ${item.discount} 件, 打 ${item.num} 折`}</div>))} {data.ladderList.map(item => (<div>{`满 ${item.discount} 件, 打 ${item.num} 折`}</div>))}
</Space> </Space>
}, },
{ {
......
...@@ -13,20 +13,11 @@ const columns_1 = ({ ...@@ -13,20 +13,11 @@ const columns_1 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
......
...@@ -16,28 +16,16 @@ const columns_2 = ({ ...@@ -16,28 +16,16 @@ const columns_2 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { if(name === 'plummetPrice') {
const _idx = Number(((current - 1) * 10) + _i); params[index][name] = Number(value);
if (_idx === index) { params[index]['activityPrice'] = sumTotal(params[index]['price'], value);
if (name === 'plummetPrice') { } else {
return { params[index][name] = Number(value);
..._item, }
[name]: Number(value),
'activityPrice': sumTotal(_item.price, value)
}
} else {
return {
..._item,
[name]: Number(value)
}
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
......
...@@ -13,29 +13,16 @@ const columns_3 = ({ ...@@ -13,29 +13,16 @@ const columns_3 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { if(name === 'discount') {
const _idx = Number(((current - 1) * 10) + _i); params[index][name] = Number(value);
if (_idx === index) { params[index]['activityPrice'] = Number(params[index]['price']) * (Number(value)) / 100;
if (name === 'discount') { } else {
return { params[index][name] = Number(value);
..._item, }
[name]: Number(value),
'activityPrice': Number(_item.price) * (Number(value)) / 100,
}
} else {
return {
..._item,
[name]: Number(value)
}
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
[ [
......
...@@ -14,20 +14,11 @@ const columns_4 = ({ ...@@ -14,20 +14,11 @@ const columns_4 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
[ [
......
...@@ -12,20 +12,11 @@ const columns_5 = ({ ...@@ -12,20 +12,11 @@ const columns_5 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
[ [
......
...@@ -13,20 +13,11 @@ const columns_6 = ({ ...@@ -13,20 +13,11 @@ const columns_6 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
[ [
......
...@@ -13,20 +13,11 @@ const columns_7 = ({ ...@@ -13,20 +13,11 @@ const columns_7 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
......
...@@ -12,20 +12,11 @@ const columns_8 = ({ ...@@ -12,20 +12,11 @@ const columns_8 = ({
const handleInputChange = (e, name, index) => { const handleInputChange = (e, name, index) => {
const { value } = e.target; const { value } = e.target;
const params = [...dataSource]; const params = [...dataSource];
const newData = params.map((_item, _i) => { params[index][name] = Number(value);
const _idx = Number(((current - 1) * 10) + _i);
if (_idx === index) {
return {
..._item,
[name]: Number(value)
}
}
return _item
})
form.setFieldsValue({ form.setFieldsValue({
'productList': newData 'productList': params
}) })
setDataSource(newData) setDataSource(params)
} }
return ( return (
[ [
......
...@@ -9,6 +9,7 @@ import CollocationLayout from '@/pages/transaction/marketingAbility/components/c ...@@ -9,6 +9,7 @@ import CollocationLayout from '@/pages/transaction/marketingAbility/components/c
import { remindLayout, RemindLayoutProps } from '@/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind'; import { remindLayout, RemindLayoutProps } from '@/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/components/productListLayout/remind';
import CouponsListLayout from '@/pages/transaction/marketingAbility/components/couponsListLayout'; import CouponsListLayout from '@/pages/transaction/marketingAbility/components/couponsListLayout';
import { number } from 'yargs'; import { number } from 'yargs';
import { PublicApi } from '@/services/api';
type optionProps = { type optionProps = {
/** key */ /** key */
...@@ -185,7 +186,6 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => { ...@@ -185,7 +186,6 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
setDataSource(fields) setDataSource(fields)
} }
return ( return (
<CardLayout <CardLayout
id="productListLayout" id="productListLayout"
......
...@@ -199,6 +199,22 @@ const DetialLayout = () => { ...@@ -199,6 +199,22 @@ const DetialLayout = () => {
}) })
} }
// useEffect(() => {
// if (!isEmpty(dataSource)) {
// PublicApi.postMarketingPlatformActivitySignupGetFilterSkuId({
// activityType: dataSource.activityType,
// activityDefinedBO: dataSource.activityDefined.allowActivity,
// startTime: dataSource.startTime,
// endTime: dataSource.endTime,
// }, { ctlType: 'none' }).then(res => {
// if (res.code !== 1000) {
// return
// }
// console.log(res.data)
// })
// }
// }, [dataSource])
return ( return (
<Context.Provider value={dataSource}> <Context.Provider value={dataSource}>
<PeripheralLayout <PeripheralLayout
......
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