diff --git a/public/officecontrol/NTKO控件安装程序-联通数字科技有限公司.exe b/public/officecontrol/NTKO控件安装程序.exe similarity index 100% rename from public/officecontrol/NTKO控件安装程序-联通数字科技有限公司.exe rename to public/officecontrol/NTKO控件安装程序.exe diff --git a/src/components/GlobalHeader/RightContent.tsx b/src/components/GlobalHeader/RightContent.tsx index 3e727d3..876aaa0 100644 --- a/src/components/GlobalHeader/RightContent.tsx +++ b/src/components/GlobalHeader/RightContent.tsx @@ -47,6 +47,9 @@ const GlobalHeaderRight: React.FC<{}> = (props) => { // let _data = { // mall3_token: sessionStorage.getItem('Authorization') // } + // 获取用户类型,用于判断返回哪个登录页面 + const userType = localStorage.getItem('userType'); + Modal.info({ title: '请确认是否退出?', content: false, @@ -63,8 +66,17 @@ const GlobalHeaderRight: React.FC<{}> = (props) => { message.success('退出登录成功'); sessionStorage.clear(); cookie.remove('mall3_token'); + + // 清空用户类型 + localStorage.removeItem('userType'); + + // 根据用户类型返回不同的登录页面 setTimeout(() => { - history.push('/login'); + if (userType === 'internal') { + history.push('/internal-login'); // 内部用户返回内部登录页 + } else { + history.push('/login'); // 普通用户返回普通登录页 + } }, 1000); } }) diff --git a/src/pages/Login/internal.tsx b/src/pages/Login/internal.tsx index 18e45b8..7b07e87 100644 --- a/src/pages/Login/internal.tsx +++ b/src/pages/Login/internal.tsx @@ -36,6 +36,7 @@ const InternalLogin: React.FC = () => { setLoading(false); if (res?.code === 200) { sessionStorage.setItem('Authorization', res?.data?.token || ''); + localStorage.setItem('userType', 'internal'); // 添加用户类型标识:内部用户 if (values.remember) { localStorage.setItem('remember_user', JSON.stringify({ username: values.username, diff --git a/src/pages/Login/login.tsx b/src/pages/Login/login.tsx index 87000fb..593a1c5 100644 --- a/src/pages/Login/login.tsx +++ b/src/pages/Login/login.tsx @@ -50,6 +50,7 @@ const Login: React.FC = () => { if (res?.code === 200) { sessionStorage.setItem('Authorization', res?.data?.token || ''); localStorage.setItem('loginType', activeTab); + localStorage.setItem('userType', 'normal'); // 添加用户类型标识:普通用户 if (values.remember) { localStorage.setItem('remember_user', JSON.stringify({ username: values.username, diff --git a/src/pages/webOffice/weboffice.tsx b/src/pages/webOffice/weboffice.tsx index 34d7959..3bd5a1e 100644 --- a/src/pages/webOffice/weboffice.tsx +++ b/src/pages/webOffice/weboffice.tsx @@ -49,7 +49,7 @@ export default class weboffice extends React.Component { title: "您尚未安装文档控件,请您下载并安装后,重新访问当前页面", content: (
+ onClick={() => location.href = '/officecontrol/NTKO控件安装程序.exe'}>下载 ) }) } diff --git a/src/pages/webOffice/weboffice0609.tsx b/src/pages/webOffice/weboffice0609.tsx index 2a29c07..7d69fcb 100644 --- a/src/pages/webOffice/weboffice0609.tsx +++ b/src/pages/webOffice/weboffice0609.tsx @@ -276,7 +276,7 @@ const WebOffice0609: React.FC