Commit 62ae8a12 authored by 徐光星's avatar 徐光星

feat: 处理包依赖问题

parent 883fcef9
...@@ -15,7 +15,7 @@ import RightContent from '@/components/GlobalHeader/RightContent'; ...@@ -15,7 +15,7 @@ import RightContent from '@/components/GlobalHeader/RightContent';
import MessageReminder from '@/components/MessageReminder'; import MessageReminder from '@/components/MessageReminder';
import { getAuthorityFromRouter, getUrlSearchParams, getToken } from '@/utils/utils'; import { getAuthorityFromRouter, getUrlSearchParams, getToken } from '@/utils/utils';
import { getSocketUrl } from '@/services/messageReminder'; import { getSocketUrl } from '@/services/messageReminder';
import logo from '../assets/logo.png'; // import logo from '../assets/logo.png';
import style from './BasicLayout.less'; import style from './BasicLayout.less';
import Socket from '@/utils/websocket'; import Socket from '@/utils/websocket';
...@@ -155,7 +155,6 @@ const BasicLayout = props => { ...@@ -155,7 +155,6 @@ const BasicLayout = props => {
// 商家端直接进入系统 // 商家端直接进入系统
const merchantLayout = () => ( const merchantLayout = () => (
<ProLayout <ProLayout
logo={logo}
onCollapse={handleMenuCollapse} onCollapse={handleMenuCollapse}
menuItemRender={(menuItemProps, defaultDom) => { menuItemRender={(menuItemProps, defaultDom) => {
if (menuItemProps.isUrl || menuItemProps.children) { if (menuItemProps.isUrl || menuItemProps.children) {
......
...@@ -2,7 +2,7 @@ import { getMenuData, getPageTitle } from '@ant-design/pro-layout'; ...@@ -2,7 +2,7 @@ import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
import { Helmet } from 'react-helmet'; import { Helmet } from 'react-helmet';
import React from 'react'; import React from 'react';
import { connect } from 'dva'; import { connect } from 'dva';
import logo from '../assets/logo.png'; // import logo from '../assets/logo.png';
import styles from './UserLayout.less'; import styles from './UserLayout.less';
const UserLayout = props => { const UserLayout = props => {
...@@ -35,7 +35,7 @@ const UserLayout = props => { ...@@ -35,7 +35,7 @@ const UserLayout = props => {
<div className={styles.content}> <div className={styles.content}>
<div className={styles.top}> <div className={styles.top}>
<div className={styles.header}> <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> <span className={styles.title}>商户管理系统</span>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment