Skip to content

M
merchant-manage-ui
Commit f0aca99e authored by 郭志伟's avatar 郭志伟
Browse files
Options

Merge branch 'feature/logo' into 'master' 

fix: 修改logo和系统名称

See merge request !43
parents a02c476b 4d466c35
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 5 deletions
config/defaultSettings.js
View file @ f0aca99e
......@@ -10,7 +10,7 @@ export default {
menu: {
locale: true,
},
title: '商户管理后台',
// title: '量星球商户管理系统',
pwa: false,
iconfontUrl: '',
};
src/layouts/BasicLayout.jsx
View file @ f0aca99e
......@@ -13,7 +13,7 @@ import { Result, Button, Layout, Menu } from 'antd';
import Authorized from '@/utils/Authorized';
import RightContent from '@/components/GlobalHeader/RightContent';
import { getAuthorityFromRouter } from '@/utils/utils';
import logo from '../assets/favicon.png';
import logo from '../assets/logo.png';
import style from './BasicLayout.less';
const { Sider } = Layout;
......@@ -68,12 +68,14 @@ const BasicLayout = props => {
*/
const handleMenuCollapse = payload => {
console.log('payload :>> ', payload);
if (dispatch) {
dispatch({
type: 'global/changeLayoutCollapsed',
payload,
});
}
setSiderCollapsed(payload);
}; // get children authority
const authorized = getAuthorityFromRouter(props.route.routes, location.pathname || '/');
......@@ -151,6 +153,17 @@ const BasicLayout = props => {
menuDataRender={() => menuData}
rightContentRender={rightProps => <RightContent {...rightProps} />}
pageTitleRender={() => ''}
menuHeaderRender={() => (
<div className={style['custom-title-box']}>
<div className={style['custom-title-box-logo']}>
<div>
<img className={style['custom-title-box-logoImg']} alt="量星球" src={logo} />
</div>
{!siderCollapsed && <div className={style['custom-title-box-logoName']}>量星球</div>}
</div>
{!siderCollapsed && <div className={style['custom-title-box-title']}>商户管理系统</div>}
</div>
)}
{...props}
{...settings}
>
......
src/layouts/BasicLayout.less
View file @ f0aca99e
.layout {
height: 100%;
}
.custom-title-box {
display: flex;
flex-wrap: wrap;
width: 208px;
padding-top: 14px;
color: #fff;
font-size: 22px;
&-logo {
display: flex;
}
&-title {
box-sizing: border-box;
width: 208px;
padding-left: 6px;
}
&-logoName {
margin-left: 5px;
}
&-logoImg {
display: block;
height: 32px;
}
}
:global {
#micro {
......
src/layouts/UserLayout.jsx
View file @ f0aca99e
......@@ -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.svg';
import logo from '../assets/logo.png';
import styles from './UserLayout.less';
const UserLayout = props => {
......@@ -36,7 +36,7 @@ const UserLayout = props => {
<div className={styles.top}>
<div className={styles.header}>
<img alt="logo" className={styles.logo} src={logo} />
<span className={styles.title}>商户管理后台</span>
<span className={styles.title}>量星球商户管理系统</span>
</div>
</div>
{children}
......
src/pages/document.ejs
View file @ f0aca99e
......@@ -7,7 +7,7 @@
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>
<title>商户管理后台</title>
<title>量星球商户管理系统</title>
<link rel="icon" href="/favicon.png" type="image/x-icon" />
</head>
<body>
......
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