张延森 преди 4 години
родител
ревизия
a364f218b9

+ 1
- 1
config/defaultSettings.js Целия файл

7
   fixedHeader: false,
7
   fixedHeader: false,
8
   fixSiderbar: true,
8
   fixSiderbar: true,
9
   colorWeak: false,
9
   colorWeak: false,
10
-  title: 'Ant Design Pro',
10
+  title: '禾生汇',
11
   pwa: false,
11
   pwa: false,
12
   iconfontUrl: '',
12
   iconfontUrl: '',
13
   menu: {
13
   menu: {

BIN
src/assets/logo.png Целия файл


BIN
src/assets/logo_1.png Целия файл


BIN
src/assets/logo_2.png Целия файл


+ 32
- 0
src/components/GlobalFooter/index.jsx Целия файл

1
+import React from 'react';
2
+import { DefaultFooter } from '@ant-design/pro-layout';
3
+
4
+export default (props) => {
5
+  return (
6
+    <DefaultFooter
7
+      copyright={`${new Date().getFullYear()} 云致科技`}
8
+      links={
9
+        [
10
+          // {
11
+          //   key: 'Ant Design Pro',
12
+          //   title: 'Ant Design Pro',
13
+          //   href: 'https://pro.ant.design',
14
+          //   blankTarget: true,
15
+          // },
16
+          // {
17
+          //   key: 'github',
18
+          //   title: <GithubOutlined />,
19
+          //   href: 'https://github.com/ant-design/ant-design-pro',
20
+          //   blankTarget: true,
21
+          // },
22
+          // {
23
+          //   key: 'Ant Design',
24
+          //   title: 'Ant Design',
25
+          //   href: 'https://ant.design',
26
+          //   blankTarget: true,
27
+          // },
28
+        ]
29
+      }
30
+    />
31
+  )
32
+}

+ 4
- 29
src/layouts/BasicLayout.jsx Целия файл

3
  *
3
  *
4
  * @see You can view component api by: https://github.com/ant-design/ant-design-pro-layout
4
  * @see You can view component api by: https://github.com/ant-design/ant-design-pro-layout
5
  */
5
  */
6
-import ProLayout, { DefaultFooter } from '@ant-design/pro-layout';
6
+import ProLayout from '@ant-design/pro-layout';
7
 import React, { useMemo } from 'react';
7
 import React, { useMemo } from 'react';
8
 // import { Link, useIntl, connect, history } from 'umi';
8
 // import { Link, useIntl, connect, history } from 'umi';
9
 import { Link, connect, history } from 'umi';
9
 import { Link, connect, history } from 'umi';
12
 import Authorized from '@/utils/Authorized';
12
 import Authorized from '@/utils/Authorized';
13
 import { getCurrentRoute } from '@/utils/utils';
13
 import { getCurrentRoute } from '@/utils/utils';
14
 import RightContent from '@/components/GlobalHeader/RightContent';
14
 import RightContent from '@/components/GlobalHeader/RightContent';
15
+import GlobalFooter from '@/components/GlobalFooter';
15
 // import { getMatchMenu } from '@umijs/route-utils';
16
 // import { getMatchMenu } from '@umijs/route-utils';
16
-import logo from '../assets/logo.svg';
17
+import logo from '../assets/logo.png';
17
 
18
 
18
 const noMatch = (
19
 const noMatch = (
19
   <Result
20
   <Result
44
     return Authorized.check(needAuth ? authority.split(',') : undefined, localItem, null);
45
     return Authorized.check(needAuth ? authority.split(',') : undefined, localItem, null);
45
   });
46
   });
46
 
47
 
47
-const defaultFooterDom = (
48
-  <DefaultFooter
49
-    copyright={`${new Date().getFullYear()} 云致科技`}
50
-    links={
51
-      [
52
-        // {
53
-        //   key: 'Ant Design Pro',
54
-        //   title: 'Ant Design Pro',
55
-        //   href: 'https://pro.ant.design',
56
-        //   blankTarget: true,
57
-        // },
58
-        // {
59
-        //   key: 'github',
60
-        //   title: <GithubOutlined />,
61
-        //   href: 'https://github.com/ant-design/ant-design-pro',
62
-        //   blankTarget: true,
63
-        // },
64
-        // {
65
-        //   key: 'Ant Design',
66
-        //   title: 'Ant Design',
67
-        //   href: 'https://ant.design',
68
-        //   blankTarget: true,
69
-        // },
70
-      ]
71
-    }
72
-  />
73
-);
48
+const defaultFooterDom = (<GlobalFooter />);
74
 
49
 
75
 const BasicLayout = (props) => {
50
 const BasicLayout = (props) => {
76
   const {
51
   const {

+ 7
- 5
src/layouts/UserLayout.jsx Целия файл

1
-import { DefaultFooter, getMenuData, getPageTitle } from '@ant-design/pro-layout';
1
+import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
2
 import { Helmet, HelmetProvider } from 'react-helmet-async';
2
 import { Helmet, HelmetProvider } from 'react-helmet-async';
3
 // import { Link, SelectLang, useIntl, connect, FormattedMessage } from 'umi';
3
 // import { Link, SelectLang, useIntl, connect, FormattedMessage } from 'umi';
4
 import { Link, connect } from 'umi';
4
 import { Link, connect } from 'umi';
5
 import React from 'react';
5
 import React from 'react';
6
-import logo from '../assets/logo.svg';
6
+import GlobalFooter from '@/components/GlobalFooter'
7
+import setting from '../../config/defaultSettings';
8
+import logo from '../assets/logo.png';
7
 import styles from './UserLayout.less';
9
 import styles from './UserLayout.less';
8
 
10
 
9
 const UserLayout = (props) => {
11
 const UserLayout = (props) => {
43
             <div className={styles.header}>
45
             <div className={styles.header}>
44
               <Link to="/">
46
               <Link to="/">
45
                 <img alt="logo" className={styles.logo} src={logo} />
47
                 <img alt="logo" className={styles.logo} src={logo} />
46
-                <span className={styles.title}>Ant Design</span>
48
+                <span className={styles.title}>{setting.title}</span>
47
               </Link>
49
               </Link>
48
             </div>
50
             </div>
49
             <div className={styles.desc}>
51
             <div className={styles.desc}>
51
                 id="pages.layouts.userLayout.title"
53
                 id="pages.layouts.userLayout.title"
52
                 defaultMessage="Ant Design 是西湖区最具影响力的 Web 设计规范"
54
                 defaultMessage="Ant Design 是西湖区最具影响力的 Web 设计规范"
53
               /> */}
55
               /> */}
54
-              Ant Design 是西湖区最具影响力的 Web 设计规范
56
+              禾生汇 一点康 管理平台
55
             </div>
57
             </div>
56
           </div>
58
           </div>
57
           {children}
59
           {children}
58
         </div>
60
         </div>
59
-        <DefaultFooter />
61
+        <GlobalFooter />
60
       </div>
62
       </div>
61
     </HelmetProvider>
63
     </HelmetProvider>
62
   );
64
   );

+ 6
- 2
src/layouts/UserLayout.less Целия файл

49
 }
49
 }
50
 
50
 
51
 .logo {
51
 .logo {
52
-  height: 44px;
53
-  margin-right: 16px;
52
+  height: 60px;
53
+  // margin-right: 16px;
54
   vertical-align: top;
54
   vertical-align: top;
55
 }
55
 }
56
 
56
 
61
   font-weight: 600;
61
   font-weight: 600;
62
   font-size: 33px;
62
   font-size: 33px;
63
   font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
63
   font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
64
+  display: inline-block;
65
+  padding-top: 6px;
64
 }
66
 }
65
 
67
 
66
 .desc {
68
 .desc {
68
   margin-bottom: 40px;
70
   margin-bottom: 40px;
69
   color: @text-color-secondary;
71
   color: @text-color-secondary;
70
   font-size: @font-size-base;
72
   font-size: @font-size-base;
73
+  padding-top: 1em;
74
+  letter-spacing: 1px;
71
 }
75
 }

+ 1
- 16
src/pages/document.ejs Целия файл

3
   <head>
3
   <head>
4
     <meta charset="UTF-8" />
4
     <meta charset="UTF-8" />
5
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
5
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
6
-    <meta
7
-      name="keywords"
8
-      content="antd,umi,umijs,ant design,脚手架,布局, Ant Design,项目,Pro,admin,控制台,主页,开箱即用,中后台,解决方案,组件库"
9
-    />
10
-    <meta
11
-      name="description"
12
-      content="
13
-    An out-of-box UI solution for enterprise applications as a React boilerplate."
14
-    />
15
-    <meta
16
-      name="description"
17
-      content="
18
-      开箱即用的中台前端/设计解决方案。"
19
-    />
20
     <meta
6
     <meta
21
       name="viewport"
7
       name="viewport"
22
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
8
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
190
           min-height: 420px;
176
           min-height: 420px;
191
         "
177
         "
192
       >
178
       >
193
-        <img src="<%= context.config.publicPath +'pro_icon.svg'%>" alt="logo" width="256" />
194
         <div class="page-loading-warp">
179
         <div class="page-loading-warp">
195
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
180
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
196
             <span class="ant-spin-dot ant-spin-dot-spin"
181
             <span class="ant-spin-dot ant-spin-dot-spin"
205
             width="32"
190
             width="32"
206
             style="margin-right: 8px"
191
             style="margin-right: 8px"
207
           />
192
           />
208
-          Ant Design
193
+          禾生汇
209
         </div>
194
         </div>
210
       </div>
195
       </div>
211
     </div>
196
     </div>