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
shenshaokai
jinfa-platform
Commits
76e82799
Commit
76e82799
authored
Oct 21, 2021
by
GuanHua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 活动商品活动详情链接跳转
parent
2c2e20cb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
index.tsx
src/pages/editor/components/drawer/commodityDrawer/index.tsx
+6
-5
index.tsx
...ttingPanel/propsSettings/components/cardNavItem/index.tsx
+7
-6
No files found.
src/pages/editor/components/drawer/commodityDrawer/index.tsx
View file @
76e82799
...
...
@@ -5,7 +5,7 @@ import { FormEffectHooks } from '@formily/antd'
import
{
StandardTable
}
from
'god'
;
import
{
LAYOUT_TYPE
}
from
'@/constants'
import
{
PublicApi
}
from
'@/services/api'
;
import
{
formatTimeString
}
from
'@/utils
'
import
moment
from
'moment
'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
;
import
Search
from
'@/components/NiceForm/components/Search'
;
...
...
@@ -57,19 +57,20 @@ const CommodityDrawer: React.FC<CommodityDrawerProps> = (props: CommodityDrawerP
<>
{
record
?.
activityList
?.
map
((
item
,
index
)
=>
{
return
(
<
div
key=
{
index
}
style=
{
{
marginBottom
:
8
}
}
>
<
a
key=
{
index
}
style=
{
{
marginBottom
:
8
}
}
href=
{
`/memberCenter/marketingAbility/selfManagement/search/preview?id=${item.id}`
}
target=
{
"_blank"
}
>
<
Space
direction=
'horizontal'
>
<
img
src=
{
ActivityImage
}
style=
{
{
width
:
24
,
height
:
24
,
borderRadius
:
4
}
}
/>
<
span
>
{
item
?.
name
}
</
span
>
<
div
className=
{
styles
[
'defaultTag'
]
}
>
{
item
?.
type
}
</
div
>
<
StatusTag
title=
{
item
?.
belongType
===
1
?
'平台活动'
:
'商家活动'
}
type=
{
item
?.
belongType
===
1
?
'primary'
:
'success'
}
/>
<
div
style=
{
{
color
:
'#301333'
}
}
>
有效期:
{
item
.
startTime
&&
moment
(
item
.
startTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
至
{
item
.
endTime
&&
moment
(
item
.
endTime
).
format
(
'YYYY-MM-DD HH:mm:ss'
)
}
</
div
>
</
Space
>
</
div
>
)
</
a
>
)
;
})
}
</>
);
}
}
;
const
columns
=
[
{
...
...
src/pages/editor/mobileSettingPanel/propsSettings/components/cardNavItem/index.tsx
View file @
76e82799
...
...
@@ -54,15 +54,15 @@ const TyleList_Own = [
label
:
'积分兑换'
,
},
{
value
:
2
,
label
:
'
公司介绍
'
,
value
:
4
,
label
:
'
行情资讯
'
,
},
{
value
:
3
,
label
:
'成为会员'
,
},
{
value
:
4
,
value
:
2
,
label
:
'公司介绍'
,
},
]
...
...
@@ -190,7 +190,7 @@ const CardNavItem: React.FC<CardNavItemProps> = (props: CardNavItemProps) => {
let
getFn
if
(
layoutType
===
LAYOUT_TYPE
.
channel
)
{
getFn
=
PublicApi
.
getSearchChannelCommodityTemplateGetFirstCategoryListByMemberId
}
else
if
(
layoutType
===
LAYOUT_TYPE
.
shop
)
{
}
else
{
params
.
memberRoleId
=
memberRoleId
getFn
=
PublicApi
.
getSearchCommodityTemplateGetFirstCategoryListByMemberId
}
...
...
@@ -318,12 +318,13 @@ const CardNavItem: React.FC<CardNavItemProps> = (props: CardNavItemProps) => {
const
handleSumit
=
(
values
)
=>
{
const
newProps
:
any
=
{
...
values
,
icon
:
values
.
icon
[
0
].
url
icon
:
values
.
icon
[
0
].
url
,
empty
:
false
}
if
(
values
.
channel
&&
values
.
type
===
3
)
{
newProps
.
id
=
values
.
channel
}
else
if
(
values
.
type
===
2
||
values
.
type
===
5
)
{
newProps
.
id
=
record
.
i
d
newProps
.
id
=
record
?
record
?.
id
:
undefine
d
}
changeProps
({
...
...
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