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
5dfe30dd
Commit
5dfe30dd
authored
Sep 15, 2020
by
XieZhiXiong
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://10.0.0.22:3000/lingxi/lingxi-business-system
into dev
parents
2cc95167
42b5806f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
3 deletions
+2
-3
index.tsx
src/pages/pageCustomized/mallEdit/index.tsx
+1
-1
index.tsx
...opsSettings/components/CategoryreCommendSetting/index.tsx
+0
-1
index.tsx
src/pages/pageCustomized/templateDetail/index.tsx
+1
-1
No files found.
src/pages/pageCustomized/mallEdit/index.tsx
View file @
5dfe30dd
...
...
@@ -190,7 +190,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
[
String
(
initIndex
+
6
)]:
{
"componentName"
:
"FloorLine.FloorHeader"
,
"props"
:
{
//
linkdisable: true,
linkdisable
:
true
,
shopNum
:
categoryDetail
.
shopNum
,
goodsNum
:
categoryDetail
.
goodsNum
},
...
...
src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx
View file @
5dfe30dd
...
...
@@ -20,7 +20,6 @@ interface CategoryRecommendSettingPropsType {
}
const
CategoryRecommendSetting
:
React
.
FC
<
CategoryRecommendSettingPropsType
>
=
(
props
)
=>
{
console
.
log
(
props
)
const
{
secondCategoryList
=
[],
categoryAdvertPicUrl
=
''
,
onChange
,
templateid
,
categoryid
}
=
props
const
[
imgUrl
,
setImgUrl
]
=
useState
<
string
>
(
categoryAdvertPicUrl
)
const
[
selectKeys
,
setSelectKeys
]
=
useState
<
number
[]
>
([])
...
...
src/pages/pageCustomized/templateDetail/index.tsx
View file @
5dfe30dd
...
...
@@ -148,7 +148,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
{
type
===
'mall'
&&
(
<
Fragment
>
<
div
className=
{
cx
(
styles
.
btn
,
styles
.
renovation
)
}
onClick=
{
()
=>
history
.
push
(
`/mall/template/edit?id=${id}&template=${detailInfo?.fileName}`
)
}
>
<
div
className=
{
cx
(
styles
.
btn
,
styles
.
renovation
)
}
onClick=
{
()
=>
window
.
location
.
href
=
`/mall/template/edit?id=${id}&template=${detailInfo?.fileName}`
}
>
<
LayoutOutlined
/>
<
label
>
装修
</
label
>
</
div
>
...
...
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