feat(login): 完善登录页面_合并几种登录方式

src/utils/index.js

@@ -2,6 +2,7 @@ export * from './generator'
 export * from './auth'
 export * from './color'
 export * from './date'
+export * from './device'
 export * from './dict'
 export * from './dynamicTitle'
 export * from './errorCode'
@@ -12,8 +13,8 @@ export * from './route'
 export * from './ruoyi'
 export * from './scroll-to'
 export * from './theme'
+export * from './url'
 export * from './validate'
-export * from './device'
 
 /**
  * @param {string} url

src/utils/url.js

+// 封装从 URL 的查询参数找到要求的 key 对应的值
+export function getQueryString(name) {
+  // 先尝试从 search 中获取查询参数
+  let search = window.location.search.substr(1);
+  // 再尝试从 hash 中获取查询参数
+  const hashIndex = window.location.href.indexOf('?', window.location.href.indexOf('#'));
+  if (hashIndex !== -1) {
+    search += '&' + window.location.href.slice(hashIndex + 1);
+  }
+  var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+  var r = search.match(reg);
+  if (r != null) {
+    return decodeURIComponent(r[2]);
+  } else {
+    return null;
+  }
+}
\ No newline at end of file

src/views/login.vue

@@ -72,7 +72,7 @@
 <script setup>
 import { fsOAuthUrl, fsClientAuth } from "@/api"
 import Cookies from "js-cookie"
-import { encrypt, decrypt } from "@/utils"
+import { encrypt, decrypt, getQueryString } from "@/utils"
 import useUserStore from '@/store/modules/user'
 
 const userStore = useUserStore()
@@ -136,27 +136,21 @@ function handleLogin() {
 
 // 自动登录
 async function checkAutoLogin() {
-  // 飞书客户端内-免登录
   if (window.h5sdk) {
+    // 飞书客户端内-自动登录
     autoLoginLoading.value = true
     const code = await fsClientAuth()
+    return loginByType('fs', { code })
+  }
+  
+  const state = getQueryString('state')
+  const code = getQueryString('code')
+  if (state === 'fs') {
+    // 飞书网页授权回调-自动登录
     loginByType('fs', { code })
-  } else {
-    // 飞书网页授权回调-免登录
-    const params = new URLSearchParams(window.location.search);
-    const code = params.get('code');
-    const state = params.get('state');
-    if (state === 'fs') {
-      loginByType('fs', { code })
-    }
-
-    // 勤策
-    // const url = window.location.href.split('?')[2]
-    // if (url) {
-    //   const params = new URLSearchParams(url);
-    //   const state = params.get('state');
-    //   state === 'STATE' && loginByType('qc', url)
-    // }
+  } else if (state === 'STATE') {
+    // 勤策系统网页跳过-自动登录
+    loginByType('qc', code)
   }
 }
 checkAutoLogin()