li.shaoyi 3 rokov pred
rodič
commit
37dc321c9c

+ 2 - 9
src/App.vue

@@ -25,13 +25,6 @@ import zhCN from 'ant-design-vue/es/locale/zh_CN';
 import { defineComponent, onMounted, provide, ref, watchEffect } from 'vue';
 let lastTime = new Date().getTime();
 
-function logoutAction() {
-  logout();
-  APP.closeServer();
-  APP.closeQuote();
-  Router.replace('/login');
-}
-
 // 设置太久没有操作界面,自动退出界面功能
 function setOvertime() {
   window.addEventListener('mousemove', () => {
@@ -52,7 +45,7 @@ function setOvertime() {
             okText: '确定',
             keyboard: false,
           });
-          logoutAction();
+          logout();
         }
       }
     },
@@ -89,7 +82,7 @@ export default defineComponent({
       TimerUtils.setTimeout(
         () => {
           spinning.value = false;
-          logoutAction();
+          logout();
         },
         1000,
         'logoutTimer'

+ 0 - 3
src/layout/components/header.vue

@@ -98,9 +98,6 @@ const setFn = () => {
   function chooseSetMenu(path: string) {
     if (path === 'logout') {
       logout();
-      APP.closeServer();
-      APP.closeQuote();
-      Router.replace('/login');
     } else {
       changeTheme(path as ThemeEnum);
       // openAction();

+ 5 - 3
src/services/bus/login.ts

@@ -13,12 +13,14 @@ import { logoutResponse } from '../socket/login';
 import { loginAction } from '../socket/login/index';
 import { LoginResponse } from '../socket/login/interface/index';
 import { getMarketByTradeMode } from './market';
-
+import Router from '@/router';
 
 export const logout = (): void => {
-    // removeLoginData();
-    sessionStorageUtil.removeItem('transaction_swap')
     logoutResponse();
+    removeLoginData();
+    APP.closeServer();
+    APP.closeQuote();
+    Router.replace('/login');
 };
 
 export const login = async (logidCode: string, password: string, byteArr: Uint8Array[], isEncryt = false): Promise<LoginResponse> => {