fix:jkhljhjkjl;j';

src/modules/root/App.tsx

@@ -2,24 +2,24 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2019-07-10 10:30:49
  * @Date: 2019-07-10 10:30:49
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-21 14:33:49
+ * @LastEditTime: 2021-07-19 16:21:07
  * @Description:
  * @Description:
  */
  */
 import React, { useContext, useEffect, useState } from 'react';
 import React, { useContext, useEffect, useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import { withRouter } from 'react-router-dom';
-import { ConfigProvider, message, Layout, DatePicker } from 'antd';
+import { ConfigProvider, message, Layout } from 'antd';
 import Header from './Header'
 import Header from './Header'
 import Menu from './Menu'
 import Menu from './Menu'
 import Main from './Main'
 import Main from './Main'
-import zhCN from 'antd/lib/locale/zh_CN'
+import zhCN from 'antd/es/locale/zh_CN'
 import User from '@/common/js/user';
 import User from '@/common/js/user';
 import BaseService from "@/domains/basic-domain/baseService";
 import BaseService from "@/domains/basic-domain/baseService";
 import moment from 'moment';
 import moment from 'moment';
-import WechatApi from '@/common/js/wechatApi';
 import { VersionContext, VersionInfo, XMContext } from '@/store/context';
 import { VersionContext, VersionInfo, XMContext } from '@/store/context';
 import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
 import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStoreList, setWechatLogin } from '@/store/actions/index';
 import Service from "@/common/js/service";
 import Service from "@/common/js/service";
 import Bus from '@/core/tbus';
 import Bus from '@/core/tbus';
+import WechatApi from '@/common/js/wechatApi';
 
 
 const { Footer, Sider, Content } = Layout;
 const { Footer, Sider, Content } = Layout;
 
 
@@ -52,12 +52,7 @@ const App: React.FC = (props: any) => {
 
 
     })
     })
 
 
-
-  async function initWechatConfig() {
-    WechatApi.initConfig({ isAgentConfig: true, url: window.location.href.split('#')[0] })
   }
   }
-}
-
   useEffect(() => {
   useEffect(() => {
     getStorePermission();
     getStorePermission();
   }, [window.location.hash])
   }, [window.location.hash])
@@ -173,6 +168,15 @@ const App: React.FC = (props: any) => {
 
 
   return (
   return (
     <div id="home">
     <div id="home">
+      {/* <Layout>
+        <Sider><Menu menuType={menuType} handleMenuType={handleMenuType} /></Sider>
+        <Layout>
+        <Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
+        <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
+        <Main menuType={menuType} />
+        </ConfigProvider>
+        </Layout>
+      </Layout> */}
       <Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
       <Header id="app" handleMenuType={handleMenuType} menuType={menuType} />
       <VersionContext.Provider value={versionInfo}>
       <VersionContext.Provider value={versionInfo}>
         <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>
         <ConfigProvider locale={zhCN} autoInsertSpaceInButton={false}>