Your Name 3 years ago
parent
commit
d8b456e385

+ 19
- 0
src/components/GlobalFooter/index.jsx View File

1
+import { DefaultFooter } from '@ant-design/pro-layout';
2
+
3
+export default (props) => {
4
+  const copyright = `${(new Date()).getFullYear()} 云致科技`
5
+
6
+  return (
7
+    <DefaultFooter
8
+      copyright={copyright}
9
+      links={[
10
+        // {
11
+        //   key: 'Ant Design Pro',
12
+        //   title: 'Ant Design Pro',
13
+        //   href: 'https://pro.ant.design',
14
+        //   blankTarget: true,
15
+        // },
16
+      ]}
17
+    />
18
+  );
19
+}

+ 3
- 18
src/layouts/BasicLayout.jsx View File

3
  * You can view component api by:
3
  * You can view component api by:
4
  * https://github.com/ant-design/ant-design-pro-layout
4
  * 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, { useEffect, useMemo } from 'react';
7
 import React, { useEffect, useMemo } from 'react';
8
 import { Link } from 'umi';
8
 import { Link } from 'umi';
9
 import { connect } from 'dva';
9
 import { connect } from 'dva';
11
 import { formatMessage } from 'umi-plugin-react/locale';
11
 import { formatMessage } from 'umi-plugin-react/locale';
12
 import Authorized from '@/utils/Authorized';
12
 import Authorized from '@/utils/Authorized';
13
 import GlobalHeader from '@/components/GlobalHeader';
13
 import GlobalHeader from '@/components/GlobalHeader';
14
+import GlobalFooter from '@/components/GlobalFooter';
14
 import { isAntDesignPro, getAuthorityFromRouter } from '@/utils/utils';
15
 import { isAntDesignPro, getAuthorityFromRouter } from '@/utils/utils';
15
 import logo from '../assets/logo.svg';
16
 import logo from '../assets/logo.svg';
16
 const noMatch = (
17
 const noMatch = (
38
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
39
     return Authorized.check(needAuth ? authority : undefined, localItem, null);
39
   });
40
   });
40
 
41
 
41
-const footerRender = () => {
42
-  const copyright = `${(new Date()).getFullYear()} 云致科技`
43
-
44
-  return (
45
-    <DefaultFooter
46
-      copyright={copyright}
47
-      links={[
48
-        // {
49
-        //   key: 'Ant Design Pro',
50
-        //   title: 'Ant Design Pro',
51
-        //   href: 'https://pro.ant.design',
52
-        //   blankTarget: true,
53
-        // },
54
-      ]}
55
-    />
56
-  );
57
-};
42
+const footerRender = () => <GlobalFooter />;
58
 
43
 
59
 const BasicLayout = (props) => {
44
 const BasicLayout = (props) => {
60
   const {
45
   const {

+ 3
- 2
src/layouts/UserLayout.jsx View File

1
-import { DefaultFooter, getMenuData, getPageTitle } from '@ant-design/pro-layout';
1
+import { getMenuData, getPageTitle } from '@ant-design/pro-layout';
2
 import { Helmet } from 'react-helmet';
2
 import { Helmet } from 'react-helmet';
3
 import { Link } from 'umi';
3
 import { Link } from 'umi';
4
 import React from 'react';
4
 import React from 'react';
5
 import { connect } from 'dva';
5
 import { connect } from 'dva';
6
 import { formatMessage } from 'umi-plugin-react/locale';
6
 import { formatMessage } from 'umi-plugin-react/locale';
7
 // import SelectLang from '@/components/SelectLang';
7
 // import SelectLang from '@/components/SelectLang';
8
+import GlobalFooter from '@/components/GlobalFooter';
8
 import logo from '../assets/logo.svg';
9
 import logo from '../assets/logo.svg';
9
 import styles from './UserLayout.less';
10
 import styles from './UserLayout.less';
10
 import setting from '../../config/defaultSettings'
11
 import setting from '../../config/defaultSettings'
52
           </div>
53
           </div>
53
           {children}
54
           {children}
54
         </div>
55
         </div>
55
-        <DefaultFooter />
56
+        <GlobalFooter />
56
       </div>
57
       </div>
57
     </>
58
     </>
58
   );
59
   );

+ 1
- 1
src/pages/activity/SignupActivity/edit/Share.jsx View File

9
 import request from '@/utils/request';
9
 import request from '@/utils/request';
10
 import yinhao from '@/assets/yinhao.png';
10
 import yinhao from '@/assets/yinhao.png';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
12
-import logo from '@/assets/logo.png';
12
+import logo from '@/assets/logo.svg';
13
 import touxiang from '@/assets/touxiang.jpg';
13
 import touxiang from '@/assets/touxiang.jpg';
14
 import poster1 from '@/assets/poster1.png';
14
 import poster1 from '@/assets/poster1.png';
15
 import poster2 from '@/assets/poster2.png';
15
 import poster2 from '@/assets/poster2.png';

+ 1
- 1
src/pages/activity/groupRoomActivity/edit/Share.jsx View File

9
 import request from '@/utils/request';
9
 import request from '@/utils/request';
10
 import yinhao from '@/assets/yinhao.png';
10
 import yinhao from '@/assets/yinhao.png';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
12
-import logo from '@/assets/logo.png';
12
+import logo from '@/assets/logo.svg';
13
 import touxiang from '@/assets/touxiang.jpg';
13
 import touxiang from '@/assets/touxiang.jpg';
14
 import poster1 from '@/assets/poster1.png';
14
 import poster1 from '@/assets/poster1.png';
15
 import poster2 from '@/assets/poster2.png';
15
 import poster2 from '@/assets/poster2.png';

+ 1
- 1
src/pages/activity/lookHouseActivity/edit/Share.jsx View File

9
 import request from '@/utils/request';
9
 import request from '@/utils/request';
10
 import yinhao from '@/assets/yinhao.png';
10
 import yinhao from '@/assets/yinhao.png';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
11
 import ImageUploader from '@/components/XForm/ImageUpload';
12
-import logo from '@/assets/logo.png';
12
+import logo from '@/assets/logo.svg';
13
 import touxiang from '@/assets/touxiang.jpg';
13
 import touxiang from '@/assets/touxiang.jpg';
14
 import poster1 from '@/assets/poster1.png';
14
 import poster1 from '@/assets/poster1.png';
15
 import poster2 from '@/assets/poster2.png';
15
 import poster2 from '@/assets/poster2.png';