Commit 93970161 by zhujian

'fixapp'

parent 639cece4
......@@ -6,8 +6,8 @@
* @Description:
*/
import React, { useContext, useEffect, useState } from 'react';
import { withRouter} from 'react-router-dom';
import {ConfigProvider } from 'antd';
import { withRouter } from 'react-router-dom';
import { ConfigProvider } from 'antd';
import Header from './Header'
import Menu from './Menu'
import Main from './Main'
......@@ -19,58 +19,64 @@ import { setStoreGroupPermission, setStorePermission, setStoreGroupList, setStor
declare var window: any;
const App: React.FC = (props: any) => {
const [storeUserId, serStoreUserId] = useState('')
const ctx: any = useContext(XMContext);
const userId = User.getUserId();
window.currentUserInstInfo = {adminId: "1305385165390426114", adminName: "吴帆", gender: "UNKNOWN", parentId: "1305385165390426114", roleRemark: "", instId: "1213001850820476929" }
const [menuType,setMenuType]=useState(true);
const [menuType, setMenuType] = useState(true);
window.ctx = ctx;
useEffect(() => {
getStoreAndUserInfo();
},[userId])
}, [])
async function getStoreAndUserInfo(){
async function getStoreAndUserInfo() {
await getStoreGroupAndStoreList();
}
function getStoreGroupAndStoreList() {
BaseService.getUserStore({ userId }).then((res) => {
const { storeGroupVOS = [], storeVOS = [] } = res.result;
const { id, storeUserId,storeName } = storeVOS[0];
const { id, storeUserId, storeName } = storeVOS[0];
User.setStoreId(id);
User.setStoreUserId(storeUserId);
User.setStoreName(storeName);
ctx.dispatch(setStoreGroupList(storeGroupVOS))
ctx.dispatch(setStoreList(storeVOS));
serStoreUserId(storeUserId)
getUserPermission();
});
}
function getUserPermission() {
BaseService.getUserPermission({ }).then((res) => {
BaseService.getUserPermission({}).then((res) => {
console.log(res.result);
const {storePermission, storePermissionGroup, storeUserPermission, storeUserPermissionGroup } = res.result;
const { storePermission, storePermissionGroup, storeUserPermission, storeUserPermissionGroup } = res.result;
ctx.dispatch(setStoreGroupPermission(storePermissionGroup))
ctx.dispatch(setStorePermission(storeUserPermissionGroup))
});
}
function handleMenuType(){
}
function handleMenuType() {
setMenuType(!menuType);
}
return (
<div id="home">
<Header handleMenuType={handleMenuType} menuType={menuType}/>
<ConfigProvider locale={zhCN} >
<Main menuType={menuType}/>
</ConfigProvider>
<Menu menuType={menuType}/>
</div>
)
if (!storeUserId) {
return <div></div>
}
return (
<div id="home">
<Header handleMenuType={handleMenuType} menuType={menuType} />
<ConfigProvider locale={zhCN} >
<Main menuType={menuType} />
</ConfigProvider>
<Menu menuType={menuType} />
</div>
)
}
export default withRouter(App)
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