Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-admin
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
shenshaokai
jinfa-admin
Commits
7dbdad2c
Commit
7dbdad2c
authored
Dec 08, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into v2
parents
0a354b92
e529843a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
index.tsx
...anel/propsSettings/components/marketingCardGood/index.tsx
+3
-0
No files found.
src/pages/pageCustomized/mobileSettingPanel/propsSettings/components/marketingCardGood/index.tsx
View file @
7dbdad2c
...
...
@@ -54,6 +54,9 @@ const MarketingCardGood: React.FC<MarketingCardGoodProps> = (props: MarketingCar
shopId
};
const
isWithActivityType
=
actType
?
{
...
common
,
activityType
:
actType
}
:
common
;
if
(
exType
)
{
isWithActivityType
.
minType
=
exType
}
return
await
getMarketingAdornPlatformActivityListAdorn
(
isWithActivityType
as
any
);
};
...
...
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