From 2b7ffdf19c0e525f03dc6234b58cac03b627f0a5 Mon Sep 17 00:00:00 2001
From: thiszhc <2029364173@qq.com>
Date: 星期六, 01 七月 2023 02:26:58 +0800
Subject: [PATCH] 前端实现切换租户选择第三方授权登录，和优化第三方页面登录注册
---
src/layout/components/SocialLogin/index.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/layout/components/SocialLogin/index.vue b/src/layout/components/SocialLogin/index.vue
index 127007b..82fb253 100644
--- a/src/layout/components/SocialLogin/index.vue
+++ b/src/layout/components/SocialLogin/index.vue
@@ -3,11 +3,14 @@
</template>
<script setup lang="ts">
-import {socialLogin} from '@/api/login';
-import {setToken} from '@/utils/auth';
+import { socialLogin } from '@/api/login';
+import { setToken } from '@/utils/auth';
+import Cookies from 'js-cookie';
+import { getToken } from '@/utils/auth';
+import router from '@/router';
const route = useRoute();
-const router = useRouter();
+const loading = ref(true);
/**
@@ -17,8 +20,16 @@
const code = route.query.code;
const state = route.query.state;
const source = route.query.source as string;
-const loading = ref(true);
-await socialLogin(source, code, state)
+const tenantId = Cookies.get("tenantId") ? Cookies.get("tenantId") as string : '000000';
+const loginType = getToken() ? 'register' : 'login';
+
+/**
+ * 閫氳繃code鑾峰彇token
+ * @param {string} source
+ * @param {string} code
+ * @param {string} state
+ */
+await socialLogin(source, tenantId, loginType, code, state)
.then(async (res) => {
if (res.code !== 200) {
ElMessage.error(res.msg);
@@ -26,9 +37,10 @@
return;
}
loading.value = false;
- setToken(res.msg);
- ElMessage.success('鐧诲綍鎴愬姛');
+ // setToken(res.msg);
+ loginType === 'login' ? setToken(res.data) : ElMessage.success(res.msg);
location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+
})
.catch(() => {
loading.value = false;
--
Gitblit v1.9.3