Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/permission.js

@@ -19,7 +19,7 @@ router.beforeEach(async (to, from, next) => {
     useUserStore().checkEnterpriseBaseInfo()
     next()
   }
-  if (getToken(to?.meta?.loginType === 'enterprise' ? 1 : 2)) {
+  if (getToken(to?.meta?.loginType === 'enterprise' ? 1 : 0)) {
     if (to.path === '/login') {
       next({ path: '/recruitHome' })
     } else {

src/utils/auth.js

@@ -10,11 +10,11 @@ const isEnterprise = () => {
 export const getIsEnterprise = () => { isEnterprise() }
 
 // 获取token
-export const getToken = (num) => { // 1:ENT, 2:PER
+export const getToken = (ENT) => {
   const arr = ['ENT_ACCESS_TOKEN', 'PER_ACCESS_TOKEN']
-  let type = isEnterprise() ? arr[0] : arr[1]
+  let type = (ENT || isEnterprise()) ? arr[0] : arr[1]
+  console.log('getToken', type)
   //
-  if (num) type = arr[num-1]
   return localStorage.getItem(type)
 }