From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/layout/components/SocialCallback/index.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/layout/components/SocialCallback/index.vue b/src/layout/components/SocialCallback/index.vue
index faf7d50..eac66bc 100644
--- a/src/layout/components/SocialCallback/index.vue
+++ b/src/layout/components/SocialCallback/index.vue
@@ -4,14 +4,11 @@
<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();
const loading = ref(true);
-
/**
* 鎺ユ敹Route浼犻�掔殑鍙傛暟
@@ -20,21 +17,26 @@
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) => {
--
Gitblit v1.9.3