fix: 修复第三方登录错误

continew-org · Jun 6, 2024 · a775b86 · a775b86
1 parent 98e8060
commit a775b86
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 37 deletions.
diff --git a/src/router/index.ts b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { type RouteRecordRaw, createRouter, createWebHashHistory } from 'vue-router'
+import { type RouteRecordRaw, createRouter, createWebHistory } from 'vue-router'
 import { useRouteStore } from '@/stores'
 
 /** 默认布局 */
@@ -19,6 +19,7 @@ export const constantRoutes: RouteRecordRaw[] = [
   },
   {
     path: '/login',
+    name: 'Login',
     component: () => import('@/views/login/index.vue'),
     meta: { hidden: true }
   },
@@ -75,7 +76,7 @@ export const constantRoutes: RouteRecordRaw[] = [
 ]
 
 const router = createRouter({
-  history: createWebHashHistory(import.meta.env.BASE_URL),
+  history: createWebHistory(import.meta.env.BASE_URL),
   routes: constantRoutes,
   scrollBehavior: () => ({ left: 0, top: 0 })
 })

diff --git a/src/views/login/social/index.vue b/src/views/login/social/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-spin :loading="loading" :tip="isLogin() ? '绑定中。。。' : '登录中。。。'">
+  <a-spin :loading="loading" :tip="isLogin() ? '绑定中...' : '登录中...'">
     <div></div>
   </a-spin>
 </template>
@@ -8,10 +8,12 @@
 import { Message } from '@arco-design/web-vue'
 import { useRoute, useRouter } from 'vue-router'
 import { bindSocialAccount } from '@/apis'
+import { useUserStore } from '@/stores'
 import { isLogin } from '@/utils/auth'
 
 const route = useRoute()
 const router = useRouter()
+const userStore = useUserStore()
 const source = route.query.source as string
 const loading = ref(false)
 
@@ -50,14 +52,14 @@ const handleBindSocial = () => {
   loading.value = true
   const { ...othersQuery } = router.currentRoute.value.query
   bindSocialAccount(source, othersQuery)
-    .then((res) => {
+    .then(() => {
       router.push({
         path: '/setting/profile',
         query: {
           ...othersQuery
         }
       })
-      proxy.$message.success(res.msg)
+      Message.success('绑定成功')
     })
     .catch(() => {
       router.push({
@@ -80,6 +82,10 @@ if (isLogin()) {
 </script>
 
 <style scoped lang="less">
+:deep(.arco-spin-mask) {
+  background-color: transparent;
+}
+
 div {
   width: 150px;
   height: 150px;

diff --git a/src/views/setting/profile/Social.vue b/src/views/setting/profile/Social.vue
@@ -44,33 +44,38 @@
 </template>
 
 <script setup lang="ts">
+import { Message } from '@arco-design/web-vue'
 import type { ModeItem } from '../type'
 import VerifyModel from '../components/VerifyModel.vue'
 import { listUserSocial, socialAuth, unbindSocialAccount } from '@/apis'
-import { useUserStore } from '@/stores'
-
-const userStore = useUserStore()
 
 const socialList = ref<any>([])
 const modeList = ref<ModeItem[]>([])
-modeList.value = [
-  {
-    title: '绑定 Gitee',
-    icon: 'gitee',
-    subtitle: `${socialList.value.includes('gitee') ? '' : '绑定后，'}可通过 Gitee 进行登录`,
-    jumpMode: 'link',
-    type: 'gitee',
-    status: socialList.value.includes('gitee')
-  },
-  {
-    title: '绑定 GitHub',
-    icon: 'github',
-    subtitle: `${socialList.value.includes('gitee') ? '' : '绑定后，'}可通过 GitHub 进行登录`,
-    type: 'github',
-    jumpMode: 'link',
-    status: socialList.value.includes('github')
-  }
-]
+
+// 初始化数据
+const initData = () => {
+  listUserSocial().then((res) => {
+    socialList.value = res.data.map((el) => el.source)
+    modeList.value = [
+      {
+        title: '绑定 Gitee',
+        icon: 'gitee',
+        subtitle: `${socialList.value.includes('GITEE') ? '' : '绑定后，'}可通过 Gitee 进行登录`,
+        jumpMode: 'link',
+        type: 'gitee',
+        status: socialList.value.includes('GITEE')
+      },
+      {
+        title: '绑定 GitHub',
+        icon: 'github',
+        subtitle: `${socialList.value.includes('GITHUB') ? '' : '绑定后，'}可通过 GitHub 进行登录`,
+        type: 'github',
+        jumpMode: 'link',
+        status: socialList.value.includes('GITHUB')
+      }
+    ]
+  })
+}
 
 // 绑定
 const onBinding = (type: string, status: boolean) => {
@@ -79,10 +84,9 @@ const onBinding = (type: string, status: boolean) => {
       window.open(res.data.authorizeUrl, '_self')
     })
   } else {
-    unbindSocialAccount(type).then((res) => {
-      if (res.code === 200) {
-        userStore.getInfo()
-      }
+    unbindSocialAccount(type).then(() => {
+      initData()
+      Message.success('解绑成功')
     })
   }
 }
@@ -93,13 +97,6 @@ const onUpdate = (type: string) => {
   verifyModelRef.value?.open(type)
 }
 
-// 初始化数据
-const initData = () => {
-  listUserSocial().then((res) => {
-    socialList.value = res.data.map((el) => el.source)
-  })
-}
-
 onMounted(() => {
   initData()
 })