Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄庭坚
jinfa-platform
Commits
7cea348f
Commit
7cea348f
authored
Oct 13, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix(营销活动): 修复bug
parent
933c521a
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
53 additions
and
116 deletions
+53
-116
index.ts
config/routes/index.ts
+1
-1
constants.tsx
src/pages/transaction/marketingAbility/common/constants.tsx
+1
-1
columns_1.tsx
...bility/components/productListLayout/columns/columns_1.tsx
+3
-12
columns_2.tsx
...bility/components/productListLayout/columns/columns_2.tsx
+8
-20
columns_3.tsx
...bility/components/productListLayout/columns/columns_3.tsx
+8
-21
columns_4.tsx
...bility/components/productListLayout/columns/columns_4.tsx
+3
-12
columns_5.tsx
...bility/components/productListLayout/columns/columns_5.tsx
+3
-12
columns_6.tsx
...bility/components/productListLayout/columns/columns_6.tsx
+3
-12
columns_7.tsx
...bility/components/productListLayout/columns/columns_7.tsx
+3
-12
columns_8.tsx
...bility/components/productListLayout/columns/columns_8.tsx
+3
-12
index.tsx
...n/marketingAbility/components/productListLayout/index.tsx
+1
-1
add.tsx
.../marketingAbility/paltformSign/readySubmitExamine/add.tsx
+16
-0
No files found.
config/routes/index.ts
View file @
7cea348f
...
...
@@ -79,7 +79,7 @@ const memberCenterRoute = {
// ProcurementRoute,
// // 合同能力
// contracRoute,
AuthConfigRoute
,
//
AuthConfigRoute,
// MemberRoute,
// HandlingRoute,
// PayandSettleRoute,
...
...
src/pages/transaction/marketingAbility/common/constants.tsx
View file @
7cea348f
...
...
@@ -191,7 +191,7 @@ export const GeneralEffect = (int, data) => {
col
:
[
{
label
:
'优惠规则'
,
extra
:
<
Space
direction=
'vertical'
>
{
data
.
ladder
BO
List
.
map
(
item
=>
(<
div
>
{
`满 ${item.discount} 件, 打 ${item.num} 折`
}
</
div
>))
}
{
data
.
ladderList
.
map
(
item
=>
(<
div
>
{
`满 ${item.discount} 件, 打 ${item.num} 折`
}
</
div
>))
}
</
Space
>
},
{
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_1.tsx
View file @
7cea348f
...
...
@@ -13,20 +13,11 @@ const columns_1 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_2.tsx
View file @
7cea348f
...
...
@@ -16,28 +16,16 @@ const columns_2 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
if
(
name
===
'plummetPrice'
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
),
'activityPrice'
:
sumTotal
(
_item
.
price
,
value
)
}
}
else
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
}
return
_item
})
if
(
name
===
'plummetPrice'
)
{
params
[
index
][
name
]
=
Number
(
value
);
params
[
index
][
'activityPrice'
]
=
sumTotal
(
params
[
index
][
'price'
],
value
);
}
else
{
params
[
index
][
name
]
=
Number
(
value
);
}
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_3.tsx
View file @
7cea348f
...
...
@@ -13,29 +13,16 @@ const columns_3 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
if
(
name
===
'discount'
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
),
'activityPrice'
:
Number
(
_item
.
price
)
*
(
Number
(
value
))
/
100
,
}
}
else
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
}
return
_item
})
if
(
name
===
'discount'
)
{
params
[
index
][
name
]
=
Number
(
value
);
params
[
index
][
'activityPrice'
]
=
Number
(
params
[
index
][
'price'
])
*
(
Number
(
value
))
/
100
;
}
else
{
params
[
index
][
name
]
=
Number
(
value
);
}
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
[
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_4.tsx
View file @
7cea348f
...
...
@@ -14,20 +14,11 @@ const columns_4 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
[
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_5.tsx
View file @
7cea348f
...
...
@@ -12,20 +12,11 @@ const columns_5 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
[
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_6.tsx
View file @
7cea348f
...
...
@@ -13,20 +13,11 @@ const columns_6 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
[
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_7.tsx
View file @
7cea348f
...
...
@@ -13,20 +13,11 @@ const columns_7 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
...
...
src/pages/transaction/marketingAbility/components/productListLayout/columns/columns_8.tsx
View file @
7cea348f
...
...
@@ -12,20 +12,11 @@ const columns_8 = ({
const
handleInputChange
=
(
e
,
name
,
index
)
=>
{
const
{
value
}
=
e
.
target
;
const
params
=
[...
dataSource
];
const
newData
=
params
.
map
((
_item
,
_i
)
=>
{
const
_idx
=
Number
(((
current
-
1
)
*
10
)
+
_i
);
if
(
_idx
===
index
)
{
return
{
...
_item
,
[
name
]:
Number
(
value
)
}
}
return
_item
})
params
[
index
][
name
]
=
Number
(
value
);
form
.
setFieldsValue
({
'productList'
:
newData
'productList'
:
params
})
setDataSource
(
newData
)
setDataSource
(
params
)
}
return
(
[
...
...
src/pages/transaction/marketingAbility/components/productListLayout/index.tsx
View file @
7cea348f
...
...
@@ -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
CouponsListLayout
from
'@/pages/transaction/marketingAbility/components/couponsListLayout'
;
import
{
number
}
from
'yargs'
;
import
{
PublicApi
}
from
'@/services/api'
;
type
optionProps
=
{
/** key */
...
...
@@ -185,7 +186,6 @@ const ProductListLayout: React.FC<ProductListProps> = (props: any) => {
setDataSource
(
fields
)
}
return
(
<
CardLayout
id=
"productListLayout"
...
...
src/pages/transaction/marketingAbility/paltformSign/readySubmitExamine/add.tsx
View file @
7cea348f
...
...
@@ -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
(
<
Context
.
Provider
value=
{
dataSource
}
>
<
PeripheralLayout
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment