From e1023bb3313282b00d6dcdefd5d7e30d7aaa1bfc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 十一月 2023 11:13:29 +0800
Subject: [PATCH] update 优化 代码中存在的警告

---
 src/layout/components/SocialCallback/index.vue |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index faf7d50..e3a50e0 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -4,9 +4,7 @@
 
 <script setup lang="ts">
 import { login, callback } from '@/api/login';
-import { setToken } from '@/utils/auth';
-import Cookies from 'js-cookie';
-import { getToken } from '@/utils/auth';
+import { setToken, getToken } from '@/utils/auth';
 import { LoginData } from '@/api/types';
 
 const route = useRoute();
@@ -20,21 +18,27 @@
 const code = route.query.code as string;
 const state = route.query.state as string;
 const source = route.query.source as string;
-const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
+const tenantId = localStorage.getItem("tenantId") ? localStorage.getItem("tenantId") as string : '000000';
 
 
 const processResponse = async (res: any) => {
   if (res.code !== 200) {
     throw new Error(res.msg);
   }
-  setToken(res.data.access_token);
+  if (res.data !== null) {
+    setToken(res.data.access_token);
+  }
   ElMessage.success(res.msg);
-  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  setTimeout(() => {
+    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  }, 2000);
 };
 
 const handleError = (error: any) => {
   ElMessage.error(error.message);
-  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  setTimeout(() => {
+    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  }, 2000);
 };
 
 const callbackByCode = async (data: LoginData) => {
@@ -48,6 +52,7 @@
 };
 
 const loginByCode = async (data: LoginData) => {
+  console.log(2)
   try {
     const res = await login(data);
     await processResponse(res);

--
Gitblit v1.9.3