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
linweijiong
jinfa-platform
Commits
fb963007
Commit
fb963007
authored
Dec 14, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 店铺装修拼团活动商品修改
parent
6decd525
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
6 deletions
+18
-6
activityProductDrawer.tsx
...ts/drawer/activityProductDrawer/activityProductDrawer.tsx
+6
-2
index.tsx
...anel/propsSettings/components/marketingCardGood/index.tsx
+4
-1
index.tsx
src/pages/mobileTemplate/shopTemplateEdit/index.tsx
+5
-1
marketing_config.ts
...pages/mobileTemplate/shopTemplateEdit/marketing_config.ts
+3
-2
No files found.
src/pages/editor/components/drawer/activityProductDrawer/activityProductDrawer.tsx
View file @
fb963007
...
...
@@ -25,6 +25,7 @@ interface Iprops {
products
:
any
[],
activityImage
:
string
,
mode
?:
'radio'
|
'checked'
,
disabledKeys
?:
number
[],
}
type
SubmitType
=
{
...
...
@@ -89,7 +90,7 @@ const columns: ColumnsType<GetMarketingAdornMerchantActivityListAdornResponseDet
const
ActivityProductDrawer
:
React
.
FC
<
Iprops
>
=
(
props
:
Iprops
)
=>
{
const
{
visible
,
onCancel
,
fetchData
=
null
,
onOk
,
products
=
[],
activityImage
,
mode
=
'checked'
}
=
props
;
const
{
visible
,
onCancel
,
fetchData
=
null
,
onOk
,
products
=
[],
activityImage
,
disabledKeys
,
mode
=
'checked'
}
=
props
;
const
[
current
,
setPage
]
=
useState
<
number
>
(
1
);
const
[
currentPageSize
,
setPageSize
]
=
useState
<
number
>
(
10
);
const
[
dataSource
,
setDataSource
]
=
useState
<
GetMarketingAdornMerchantActivityListAdornResponseDetail
[]
>
([]);
...
...
@@ -178,7 +179,10 @@ const ActivityProductDrawer: React.FC<Iprops> = (props: Iprops) => {
const
rowSelection
=
{
type
:
mode
,
onSelect
:
handleRowSelect
,
selectedRowKeys
:
selectedRowKeys
selectedRowKeys
:
selectedRowKeys
,
getCheckboxProps
:
(
record
:
any
)
=>
({
disabled
:
disabledKeys
?.
includes
(
record
.
id
),
// Column configuration not to be checked
}),
};
const
drawerStyle
=
{
background
:
'#FAFBFC'
};
...
...
src/pages/editor/mobileSettingPanel/propsSettings/components/marketingCardGood/index.tsx
View file @
fb963007
...
...
@@ -8,6 +8,7 @@ import { getMarketingAdornActivityGoodsAdorn, getMarketingAdornMerchantActivityL
import
StatusTag
from
'@/components/StatusTag'
;
import
ActivityProductDrawer
from
'@/pages/editor/components/drawer/activityProductDrawer/activityProductDrawer'
;
import
ActivityImage
from
'@/assets/couponIcons/ActivityImage.svg'
;
import
useSamLevelProps
from
'../../../common/hooks/useSameLevelProps'
;
import
{
priceFormat
}
from
'@/utils/numberFomat'
;
import
styles
from
'./index.less'
;
import
{
LAYOUT_TYPE
}
from
'@/constants'
;
...
...
@@ -24,7 +25,7 @@ interface MarketingCardGoodProps {
}
const
MarketingCardGood
:
React
.
FC
<
MarketingCardGoodProps
>
=
(
props
:
MarketingCardGoodProps
)
=>
{
const
{
id
,
actType
,
exType
,
tags
=
[],
layoutType
,
pageConfig
}
=
props
;
const
{
id
,
actType
,
exType
,
tags
=
[],
layoutType
,
selectedKey
,
pageConfig
}
=
props
;
const
{
query
:
{
shopId
}
}:
any
=
history
.
location
;
const
intl
=
useIntl
()
const
[
record
,
setRecord
]
=
useState
<
any
>
([]);
...
...
@@ -35,6 +36,7 @@ const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCar
const
[
editInputValue
,
setEditInputValue
]
=
useState
<
any
>
(
''
);
const
[
inputValue
,
setInputValue
]
=
useState
<
any
>
(
''
);
const
[
inputVisible
,
setInputVisible
]
=
useState
(
false
);
const
sameLevelPropsList
=
useSamLevelProps
({
key
:
selectedKey
})
useEffect
(()
=>
{
if
(
id
&&
id
!=
record
[
0
]?.
id
)
{
...
...
@@ -379,6 +381,7 @@ const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCar
onOk=
{
onOk
}
fetchData=
{
fetchData
}
visible=
{
actVisible
}
disabledKeys=
{
sameLevelPropsList
?
sameLevelPropsList
.
map
((
item
)
=>
item
.
id
)
:
[]
}
onCancel=
{
()
=>
setActVisible
(
false
)
}
mode=
'radio'
/>
...
...
src/pages/mobileTemplate/shopTemplateEdit/index.tsx
View file @
fb963007
...
...
@@ -765,9 +765,13 @@ const mobileShopTempleteEdit: React.FC<ShopPreviewPropsType> = (props) => {
_marketingConfig13
[
_newKey
]
=
{
key
:
_newKey
,
title
:
item
.
productName
,
componentName
:
'MarketingCard.
CollageContainer
Item'
,
componentName
:
'MarketingCard.
Detail
Item'
,
props
:
{
...
item
,
style
:
{
padding
:
'8px'
,
backgroundColor
:
'#FFF'
,
},
detail
:
{
title
:
item
.
productName
,
img
:
item
.
productImgUrl
,
...
...
src/pages/mobileTemplate/shopTemplateEdit/marketing_config.ts
View file @
fb963007
...
...
@@ -464,6 +464,7 @@ export const marketingConfig_12 = {
},
};
// 拼团
export
const
marketingConfig_13
=
{
'11-13'
:
{
title
:
`
${
intl
.
formatMessage
({
id
:
'editor.marketing.activity'
})}
-
${
intl
.
formatMessage
({
id
:
'editor.marketing.type_title_13'
})}
`
,
...
...
@@ -488,12 +489,12 @@ export const marketingConfig_13 = {
title
:
intl
.
formatMessage
({
id
:
'editor.template.activity.goods.container'
}),
canEdit
:
true
,
canHide
:
false
,
componentName
:
'MarketingCard.
Collage
Container'
,
componentName
:
'MarketingCard.
Vertical
Container'
,
props
:
{
type
:
9
,
},
childNodes
:
[],
childComponentName
:
'MarketingCard.
CollageContainer
Item'
,
childComponentName
:
'MarketingCard.
Detail
Item'
,
addBtnText
:
intl
.
formatMessage
({
id
:
'editor.template.add.product'
}),
},
};
...
...
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