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
683b899f
Commit
683b899f
authored
Mar 16, 2022
by
Bill
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
bcb11f1a
8da826b5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
index.tsx
src/pages/memberManage/components/EquityInfo/index.tsx
+1
-1
index.tsx
src/pages/pageCustomized/mobileEdit/index.tsx
+14
-1
No files found.
src/pages/memberManage/components/EquityInfo/index.tsx
View file @
683b899f
...
...
@@ -110,7 +110,7 @@ const EquityInfo: React.FC<EquityInfoProps> = ({
},
{
title
:
'会员权益名称'
,
dataIndex
:
'rightTypeName
'
,
dataIndex
:
'rightTypeName'
,
align
:
'center'
,
},
{
...
...
src/pages/pageCustomized/mobileEdit/index.tsx
View file @
683b899f
...
...
@@ -491,6 +491,19 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
}
};
const
getPageTitle
=
()
=>
{
switch
(
Number
(
environment
))
{
case
2
:
return
"H5首页"
case
3
:
return
"小程序首页"
case
4
:
return
"APP首页"
default
:
return
"首页"
}
}
return
!
loading
?
(
<
BrickProvider
config=
{
config
}
...
...
@@ -499,7 +512,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
}
}
>
<
div
className=
{
styles
[
'wrapper'
]
}
>
<
ToolBar
type=
{
1
}
title=
{
Number
(
environment
)
===
4
?
"APP首页"
:
'小程序首页'
}
saveType=
{
1
}
templateInfo=
{
templateInfo
}
showActions=
{
true
}
templateId=
{
id
}
/>
<
ToolBar
type=
{
1
}
title=
{
getPageTitle
()
}
saveType=
{
1
}
templateInfo=
{
templateInfo
}
showActions=
{
true
}
templateId=
{
id
}
/>
<
div
className=
{
styles
[
'content'
]
}
>
<
MobileEditLeft
/>
<
div
className=
{
styles
[
'app-wrapper'
]
}
>
...
...
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