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

src/components/VerificationCode/index.vue

@@ -116,7 +116,7 @@ const autoTimer = () => {
 autoTimer()
 const loginUserPhone = localStorage.getItem('loginUserPhone') || '13229740091'
 const loginData = reactive({
-  phone: loginUserPhone, // 13229740091小梅 // 15775026250 瑞森
+  phone: loginUserPhone, // 13229740091 小梅 // 15775026250 瑞森
   code: '123456'
 })
 

src/permission.js

@@ -19,6 +19,10 @@ const { start, done } = useNProgress()
 //   '/recruit/position',
 //   '/recruit/position/details',
 // ]
+
+// loginType：1.enterprise: 企业路由
+//            2.personal: 个人路由
+//            3.noLogin: 无需登录也能访问的页面（personal里面的一种特殊类型，企业相关路由都需要登录）
 // 路由守卫
 router.beforeEach(async (to, from, next) => {
   start()
@@ -30,6 +34,7 @@ router.beforeEach(async (to, from, next) => {
       const type = localStorage.getItem('loginType')
       // 判断企业路由和个人路由，防止互串
       if (!type) { removeToken(); next(`/login?redirect=${to.fullPath}`) }
+      else if (type === 'enterprise' && to.meta?.loginType === 'noLogin') next({ path: `/${type}` })
       else if (type === 'personal' && to.meta?.loginType === 'noLogin') next()
       else if (to.meta?.loginType === type) next()
       else next({ path: `/${type}` })

src/router/modules/recruit.js

@@ -12,8 +12,7 @@ const recruit = [
         component: () => import('@/views/recruit/position'),
         name: 'recruitPosition',
         meta: {
-          title: '职位',
-          loginType: 'noLogin'
+          title: '职位'
         }
       },
       {
@@ -21,8 +20,7 @@ const recruit = [
         component: () => import('@/views/recruit/company'),
         name: 'recruitCompany',
         meta: {
-          title: '公司',
-          loginType: 'noLogin'
+          title: '公司'
         }
       },
       {
@@ -30,8 +28,7 @@ const recruit = [
         component: () => import('@/views/recruit/position/components/details'),
         name: 'recruitPositionDetails',
         meta: {
-          title: '职位详情',
-          loginType: 'noLogin'
+          title: '职位详情'
         }
       }
     ]
@@ -48,8 +45,7 @@ const recruit = [
         path: '/company/details/:id',
         component: () => import('@/views/enterprise/components/enterpriseDetails.vue'),
         meta: {
-          title: '企业详情',
-          loginType: 'noLogin'
+          title: '企业详情'
         },
       }
     ]

src/router/modules/remaining.js

@@ -4,16 +4,7 @@ import recruit from './recruit'
 import Layout from '@/layout'
 import { setLoginType } from '@/utils/loginType'
 
-setLoginType(recruit, 'noLogin')
-setLoginType(personal, 'personal')
-setLoginType(enterprise, 'enterprise')
 
-const routeArray = [
-  ...recruit,
-  ...personal,
-  ...enterprise
-]
-// const items = routeArray[type]
 const remainingRouter = [
   {
     path: '/login',
@@ -21,8 +12,7 @@ const remainingRouter = [
     name: 'login',
     meta: {
       hidden: true,
-      title: '登录/注册',
-      loginType: 'noLogin'
+      title: '登录/注册'
     }
   },
   {
@@ -34,8 +24,7 @@ const remainingRouter = [
         path: '/userAgreement',
         component: () => import('@/views/login/components/userAgreement.vue'),
         meta: {
-          title: '用户协议',
-          loginType: 'noLogin'
+          title: '用户协议'
         }
       }
     ]
@@ -49,8 +38,7 @@ const remainingRouter = [
         path: '/privacyPolicy',
         component: () => import('@/views/login/components/privacyPolicy.vue'),
         meta: {
-          title: '隐私政策',
-          loginType: 'noLogin'
+          title: '隐私政策'
         }
       }
     ]
@@ -64,31 +52,30 @@ const remainingRouter = [
         path: '/personal',
         redirect: '/home',
         meta: {
-          title: '首页',
-          loginType: 'noLogin'
+          title: '首页'
         }
       },
       {
         path: '/home',
         component: () => import('@/views/Home/index'),
         meta: {
-          title: '首页',
-          loginType: 'noLogin'
+          title: '首页'
         }
       }
     ]
   },
-  // {
-  //   path: '/register',
-  //   component: () => import('@/views/enterprise/components/register'),
-  //   name: 'register',
-  //   meta: {
-  //     hidden: true,
-  //     title: '注册企业',
-  //     loginType: 'noLogin'
-  //   }
-  // },
-  ...routeArray
 ]
 
-export default remainingRouter
+setLoginType(remainingRouter, 'noLogin')
+setLoginType(recruit, 'noLogin')
+setLoginType(personal, 'personal')
+setLoginType(enterprise, 'enterprise')
+
+const routeArray = [
+  ...remainingRouter,
+  ...recruit,
+  ...personal,
+  ...enterprise
+]
+
+export default routeArray