Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
merchant-manage-ui
Commits
62ae8a12
Commit
62ae8a12
authored
Jan 17, 2024
by
徐光星
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 处理包依赖问题
parent
883fcef9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
BasicLayout.jsx
src/layouts/BasicLayout.jsx
+1
-2
UserLayout.jsx
src/layouts/UserLayout.jsx
+2
-2
No files found.
src/layouts/BasicLayout.jsx
View file @
62ae8a12
...
...
@@ -15,7 +15,7 @@ import RightContent from '@/components/GlobalHeader/RightContent';
import
MessageReminder
from
'
@/components/MessageReminder
'
;
import
{
getAuthorityFromRouter
,
getUrlSearchParams
,
getToken
}
from
'
@/utils/utils
'
;
import
{
getSocketUrl
}
from
'
@/services/messageReminder
'
;
import
logo
from
'
../assets/logo.png
'
;
//
import logo from '../assets/logo.png';
import
style
from
'
./BasicLayout.less
'
;
import
Socket
from
'
@/utils/websocket
'
;
...
...
@@ -155,7 +155,6 @@ const BasicLayout = props => {
// 商家端直接进入系统
const
merchantLayout
=
()
=>
(
<
ProLayout
logo=
{
logo
}
onCollapse=
{
handleMenuCollapse
}
menuItemRender=
{
(
menuItemProps
,
defaultDom
)
=>
{
if
(
menuItemProps
.
isUrl
||
menuItemProps
.
children
)
{
...
...
src/layouts/UserLayout.jsx
View file @
62ae8a12
...
...
@@ -2,7 +2,7 @@ import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
import
{
Helmet
}
from
'
react-helmet
'
;
import
React
from
'
react
'
;
import
{
connect
}
from
'
dva
'
;
import
logo
from
'
../assets/logo.png
'
;
//
import logo from '../assets/logo.png';
import
styles
from
'
./UserLayout.less
'
;
const
UserLayout
=
props
=>
{
...
...
@@ -35,7 +35,7 @@ const UserLayout = props => {
<
div
className=
{
styles
.
content
}
>
<
div
className=
{
styles
.
top
}
>
<
div
className=
{
styles
.
header
}
>
<
img
alt=
"logo"
className=
{
styles
.
logo
}
src=
{
logo
}
/>
{
/* <img alt="logo" className={styles.logo} src={logo} /> */
}
<
span
className=
{
styles
.
title
}
>
商户管理系统
</
span
>
</
div
>
</
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