Skip to content

M
merchant-manage-ui
Commit ae82c06b authored by 武广's avatar 武广
Browse files
Options

Merge branch 'master' of git.quantgroup.cn:ui/merchant-manage-ui into feature/service-product

parents c7ec4ccb f0aca99e
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 9 deletions
config/defaultSettings.js
View file @ ae82c06b
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
menu: { menu: {
locale: true, locale: true,
}, },
title: '商户管理后台', // title: '量星球商户管理系统',
pwa: false, pwa: false,
iconfontUrl: '', iconfontUrl: '',
}; };
src/layouts/BasicLayout.jsx
View file @ ae82c06b
...@@ -13,7 +13,7 @@ import { Result, Button, Layout, Menu } from 'antd'; ...@@ -13,7 +13,7 @@ import { Result, Button, Layout, Menu } from 'antd';
import Authorized from '@/utils/Authorized'; import Authorized from '@/utils/Authorized';
import RightContent from '@/components/GlobalHeader/RightContent'; import RightContent from '@/components/GlobalHeader/RightContent';
import { getAuthorityFromRouter } from '@/utils/utils'; import { getAuthorityFromRouter } from '@/utils/utils';
import logo from '../assets/favicon.png'; import logo from '../assets/logo.png';
import style from './BasicLayout.less'; import style from './BasicLayout.less';
const { Sider } = Layout; const { Sider } = Layout;
...@@ -68,12 +68,14 @@ const BasicLayout = props => { ...@@ -68,12 +68,14 @@ const BasicLayout = props => {
*/ */
const handleMenuCollapse = payload => { const handleMenuCollapse = payload => {
console.log('payload :>> ', payload);
if (dispatch) { if (dispatch) {
dispatch({ dispatch({
type: 'global/changeLayoutCollapsed', type: 'global/changeLayoutCollapsed',
payload, payload,
}); });
} }
setSiderCollapsed(payload);
}; // get children authority }; // get children authority
const authorized = getAuthorityFromRouter(props.route.routes, location.pathname || '/'); const authorized = getAuthorityFromRouter(props.route.routes, location.pathname || '/');
...@@ -151,6 +153,17 @@ const BasicLayout = props => { ...@@ -151,6 +153,17 @@ const BasicLayout = props => {
menuDataRender={() => menuData} menuDataRender={() => menuData}
rightContentRender={rightProps => <RightContent {...rightProps} />} rightContentRender={rightProps => <RightContent {...rightProps} />}
pageTitleRender={() => ''} 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} {...props}
{...settings} {...settings}
> >
......
src/layouts/BasicLayout.less
View file @ ae82c06b
.layout { .layout {
height: 100%; 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 { :global {
#micro { #micro {
......
src/layouts/UserLayout.jsx
View file @ ae82c06b
...@@ -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.svg'; import logo from '../assets/logo.png';
import styles from './UserLayout.less'; import styles from './UserLayout.less';
const UserLayout = props => { const UserLayout = props => {
...@@ -36,7 +36,7 @@ const UserLayout = props => { ...@@ -36,7 +36,7 @@ const UserLayout = props => {
<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>
{children} {children}
......
src/pages/document.ejs
View file @ ae82c06b
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
name="viewport" name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/> />
<title>商户管理后台</title> <title>量星球商户管理系统</title>
<script
type="text/javascript"
src="https://api.map.baidu.com/api?v=3.0&ak=5gZyih0oAhiNdbbdPKTc9ZGYOwel8bYN&type=webgl"
></script>
<link rel="icon" href="/favicon.png" type="image/x-icon" /> <link rel="icon" href="/favicon.png" type="image/x-icon" />
</head> </head>
<body> <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