diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx index 78ab70c..544785f 100644 --- a/src/layouts/BasicLayout.tsx +++ b/src/layouts/BasicLayout.tsx @@ -12,7 +12,7 @@ import { ConnectState } from '@/models/connect'; import { getMatchMenu } from '@umijs/route-utils'; import { getMenu } from './services' import logo from '../assets/logo.svg'; -import { getSessionRoleData } from '@/utils/session'; +import { getSessionRoleData, getSessionUserData } from '@/utils/session'; import { HomeOutlined, @@ -140,6 +140,8 @@ const BasicLayout: React.FC = (props) => { const [menuData, setMenuData] = React.useState(); const [menuShow, setmenuShow] = React.useState(false); const menuDataRef = useRef([]); + const mall3_token: any = sessionStorage.getItem('Authorization');//当前登录token + const userData: any = getSessionUserData();//当前登录人信息 useEffect(() => { if (getSessionRoleData()?.roleId) { let params = { @@ -206,7 +208,9 @@ const BasicLayout: React.FC = (props) => { } else if (menuItemProps.frame && menuItemProps.frame == 'Y') { return window.open(menuItemProps.path)} to="#">{defaultDom}; } else if (menuItemProps.frame && menuItemProps.frame == 'S') { - return window.open(menuItemProps.path + '&mall3_token=' + sessionStorage.getItem('Authorization'))} to="#">{defaultDom}; + const initPath = menuItemProps.path; + const rePath = initPath?.replace("{mall3_token}", mall3_token).replace("{loginName}", userData.loginName).replace("{organizationId}", userData.organizationId); + return window.open(rePath)} to="#">{defaultDom}; } else { return {defaultDom}; }