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

src/components/Position/item.vue

@@ -85,7 +85,7 @@ const handleEnterprise = (item) => {
   emits('enterprise', item)
 }
 
-const height = ((192 * 3) - 12) + 'px'
+const height = ((210 * 2) + 12) + 'px'
 </script>
 
 <style lang="scss" scoped>

src/layout/company/navBar.vue

@@ -13,7 +13,7 @@
         </div>
         
         <div class="d-flex user-nav">
-          <a target="_blank" href="/enterprise/purchasePackage" class="cursor-pointer mr-15" style="font-size: 15px;color: #FB8C00;line-height: 40px;">{{ $t('vipPackage.purchasePackage') }}</a>
+          <a target="_blank" href="/recruit/enterprise/purchasePackage" class="cursor-pointer mr-15" style="font-size: 15px;color: #FB8C00;line-height: 40px;">{{ $t('vipPackage.purchasePackage') }}</a>
           <div class="d-flex align-center cursor-pointer" @click="handleEnterpriseClick">
             <v-img @click="enterpriseClick(2)" rounded width="40" height="40" :src="baseInfo?.logoUrl || 'https://minio.citupro.com/dev/menduner/7.png'" ></v-img>
             <span @click="enterpriseClick(1)" class="ml-3">{{ baseInfo?.enterpriseName || $t('sys.tourist') }}</span>
@@ -96,16 +96,16 @@ const userStore = useUserStore()
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
-const handleLogoClick = () => { router.push({ path: '/enterprise'}) }
+const handleLogoClick = () => { router.push({ path: '/recruit/enterprise'}) }
 
 const handleToPersonalCenter = () => {
-  // router.push({ path: '/personalCenter' })
+  // router.push({ path: '/recruit/personal/personalCenter' })
 }
 const handleEnterpriseClick = () => {
-  // router.push({ path: '/enterprise/enterpriseCenter?key=mIntroduction' })
+  // router.push({ path: '/recruit/enterprise/enterpriseCenter?key=mIntroduction' })
 }
 const enterpriseClick = (tabKey = 1) => {
-  const path = '/enterprise/informationManagement/informationSettings'
+  const path = '/recruit/enterprise/informationManagement/informationSettings'
   router.push({ path, query: { tabKey } })
 }
 
@@ -116,9 +116,9 @@ const handleLogout = async () => {
 }
 
 const items = ref([
-  { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/enterprise/informationSettings' }) },
+  { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/recruit/enterprise/informationSettings' }) },
   { title: t('setting.switchToJobSeeker'), icon: 'mdi-swap-horizontal', change: handleLogout },
-  // { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/enterprise/myAccount' }) },
+  // { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/recruit/enterprise/myAccount' }) },
   { title: t('setting.logOut'), icon: 'mdi-logout', change: handleLogout }
 ])
 

src/layout/enterprise.vue

@@ -40,9 +40,9 @@ const router = useRouter()
 const route = useRoute()
 
 const whiteList = [
-  '/enterprise/talentPool/details',
-  '/enterprise/position/details',
-  '/enterprise/purchasePackage'
+  '/recruit/enterprise/talentPool/details',
+  '/recruit/enterprise/position/details',
+  '/recruit/enterprise/purchasePackage'
 ]
 // 查询是否在白名单内，在则不展示面包屑
 const isInWhiteList = (url, whiteList)=> {

src/layout/personal/navBar.vue

@@ -158,7 +158,7 @@ const toEnterprise = async (enterpriseId) => {
   await getUserBindEnterpriseList({ enterpriseId })
   // 获取企业账号令牌以及企业用户个人信息
   await userStore.changeRole(enterpriseId)
-  router.push({ path: '/enterprise' })
+  router.push({ path: '/recruit/enterprise' })
   localStorage.setItem('loginType', 'enterprise')
 }
 // // 切换为招聘者
@@ -176,7 +176,7 @@ const getApplyInfo = async () => {
 }
 
 const handleToPersonalCenter = () => {
-  router.push({ path: '/personalCenter' })
+  router.push({ path: '/recruit/personal/personalCenter' })
 }
 
 // 退出登录
@@ -186,7 +186,7 @@ const handleLogout = async () => {
 }
 
 const items = ref([
-  { title: t('resume.onlineResume'), icon: 'mdi-list-box-outline', change: () => router.push({ path: '/resume' }) },
+  { title: t('resume.onlineResume'), icon: 'mdi-list-box-outline', change: () => router.push({ path: '/recruit/personal/resume' }) },
   { title: t('setting.accountSettings'), icon: 'mdi-cog-outline', change: () => router.push({ path: '/personalAccount/accountBinding' }) },
   { title: t('setting.switchToRecruit'), icon: 'mdi-swap-horizontal', change: changeLoginType },
   { title: t('publicRecruitment.bountyRewards'), icon: 'mdi-google-circles-extended', change: () => router.push({ path: '/myPublicRecruitment' }) },

src/layout/personal/slider.vue

@@ -24,7 +24,7 @@ const list = [
   { mdi: 'mdi-arrow-up-bold', tips: '返回顶部' },
   { mdi: 'mdi-qrcode', tips: '微信公众号', showImg: 'https://minio.citupro.com/dev/static/mendunerCode.jpg' },
   { mdi: 'mdi-face-agent', tips: '客服' },
-  { mdi: 'mdi-list-box-outline', tips: '在线简历', path: '/resume' }
+  { mdi: 'mdi-list-box-outline', tips: '在线简历', path: '/recruit/personal/resume' }
 ]
 
 const handleClick = (item, index) => {

src/router/modules/enterprise.js

@@ -3,12 +3,12 @@ import Layout from '@/layout/enterprise.vue'
 
 const enterprise = [
   {
-    path: '/enterprise',
+    path: '/recruit/enterprise',
     show: true,
-    redirect: '/enterprise/talentPool',
+    redirect: '/recruit/enterprise/talentPool',
   },
   {
-    path: '/enterprise/talentPool',
+    path: '/recruit/enterprise/talentPool',
     component: Layout,
     name: 'talentPool',
     meta: {
@@ -18,14 +18,14 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/talentPool',
+        path: '/recruit/enterprise/talentPool',
         show: true,
-        component: () => import('@/views/enterprise/talentPool/index.vue')
+        component: () => import('@/views/recruit/enterprise/talentPool/index.vue')
       },
       {
-        path: '/enterprise/talentPool/details/:id',
+        path: '/recruit/enterprise/talentPool/details/:id',
         show: true,
-        component: () => import('@/views/enterprise/talentPool/components/details'),
+        component: () => import('@/views/recruit/enterprise/talentPool/components/details'),
         name: 'talentPoolDetails',
         meta: {
           title: '人才详情',
@@ -35,10 +35,10 @@ const enterprise = [
     ]
   },
   {
-    path: '/enterprise/statistics',
+    path: '/recruit/enterprise/statistics',
     component: Layout,
     name: 'enterpriseStatistics',
-    redirect: '/enterprise/statistics/overallAnalysis',
+    redirect: '/recruit/enterprise/statistics/overallAnalysis',
     meta: {
       title: '统计分析',
       enName: 'Statistics',
@@ -46,17 +46,17 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/statistics/overallAnalysis',
+        path: '/recruit/enterprise/statistics/overallAnalysis',
         meta: {
           title: '整体分析',
           enName: 'Overall analysis'
         },
-        component: () => import('@/views/enterprise/statistics/overallAnalysis.vue')
+        component: () => import('@/views/recruit/enterprise/statistics/overallAnalysis.vue')
       }
     ]
   },
   {
-    path: '/enterprise/position',
+    path: '/recruit/enterprise/position',
     component: Layout,
     name: 'jobManagement',
     meta: {
@@ -66,42 +66,42 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/position',
+        path: '/recruit/enterprise/position',
         meta: {
           title: '职位列表',
           enName: 'Job list'
         },
-        component: () => import('@/views/enterprise/positionManagement/index.vue')
+        component: () => import('@/views/recruit/enterprise/positionManagement/index.vue')
       },
       {
-        path: '/enterprise/position/add',
+        path: '/recruit/enterprise/position/add',
         show: true,
         meta: {
           title: '新增职位'
         },
-        component: () => import('@/views/enterprise/positionManagement/components/add.vue')
+        component: () => import('@/views/recruit/enterprise/positionManagement/components/add.vue')
       },
       {
-        path: '/enterprise/position/edit',
+        path: '/recruit/enterprise/position/edit',
         show: true,
         meta: {
           title: '职位编辑'
         },
-        component: () => import('@/views/enterprise/positionManagement/components/add.vue')
+        component: () => import('@/views/recruit/enterprise/positionManagement/components/add.vue')
       },
       {
-        path: '/enterprise/position/details/:id',
+        path: '/recruit/enterprise/position/details/:id',
         show: true,
         meta: {
           title: '职位详情',
           hideSide: true
         },
-        component: () => import('@/views/enterprise/positionManagement/components/details.vue')
+        component: () => import('@/views/recruit/enterprise/positionManagement/components/details.vue')
       }
     ]
   },
   {
-    path: '/enterprise/communication',
+    path: '/recruit/enterprise/communication',
     component: Layout,
     name: 'Communication',
     meta: {
@@ -111,14 +111,14 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/communication',
+        path: '/recruit/enterprise/communication',
         show: true,
-        component: () => import('@/views/enterprise/communication/index.vue')
+        component: () => import('@/views/recruit/enterprise/communication/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/interview',
+    path: '/recruit/enterprise/interview',
     component: Layout,
     name: 'interview',
     meta: {
@@ -128,14 +128,14 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/interview',
+        path: '/recruit/enterprise/interview',
         show: true,
-        component: () => import('@/views/enterprise/interview/index.vue')
+        component: () => import('@/views/recruit/enterprise/interview/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/personnelManagement',
+    path: '/recruit/enterprise/personnelManagement',
     component: Layout,
     name: 'personnelManagement',
     meta: {
@@ -145,16 +145,16 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/personnelManagement',
+        path: '/recruit/enterprise/personnelManagement',
         show: true,
-        component: () => import('@/views/enterprise/personnelManagement/index.vue')
+        component: () => import('@/views/recruit/enterprise/personnelManagement/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/informationManagement',
+    path: '/recruit/enterprise/informationManagement',
     component: Layout,
-    redirect: '/enterprise/informationManagement/informationSettings',
+    redirect: '/recruit/enterprise/informationManagement/informationSettings',
     name: 'informationManagement',
     meta: {
       title: '信息管理',
@@ -163,28 +163,28 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/informationManagement/informationSettings',
+        path: '/recruit/enterprise/informationManagement/informationSettings',
         meta: {
           title: '企业信息设置',
           isAdmin: true,
           enName: 'Enterprise Information Settings'
         },
-        component: () => import('@/views/enterprise/informationManagement/informationSettings.vue')
+        component: () => import('@/views/recruit/enterprise/informationManagement/informationSettings.vue')
       },
       {
-        path: '/enterprise/informationSettings',
+        path: '/recruit/enterprise/informationSettings',
         meta: {
           title: '个人信息设置',
           enName: 'Personal information settings'
         },
-        component: () => import('@/views/enterprise/informationSetting/index.vue')
+        component: () => import('@/views/recruit/enterprise/informationSetting/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/systemManagement',
+    path: '/recruit/enterprise/systemManagement',
     component: Layout,
-    redirect: '/enterprise/systemManagement/userManagement',
+    redirect: '/recruit/enterprise/systemManagement/userManagement',
     name: 'systemManagement',
     meta: {
       title: '系统管理',
@@ -194,19 +194,19 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/systemManagement/userManagement',
+        path: '/recruit/enterprise/systemManagement/userManagement',
         meta: {
           title: '用户管理',
           enName: 'User Management '
         },
-        component: () => import('@/views/enterprise/systemManagement/userManagement/index.vue')
+        component: () => import('@/views/recruit/enterprise/systemManagement/userManagement/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/memberCenter',
+    path: '/recruit/enterprise/memberCenter',
     component: Layout,
-    redirect: '/enterprise/memberCenter/myAccount',
+    redirect: '/recruit/enterprise/memberCenter/myAccount',
     name: 'enterpriseMemberCenter',
     meta: {
       title: '会员中心',
@@ -216,37 +216,37 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/memberCenter/myAccount',
+        path: '/recruit/enterprise/memberCenter/myAccount',
         meta: {
           title: '我的会员',
           enName: 'My Account '
         },
-        component: () => import('@/views/enterprise/memberCenter/myAccount/index.vue')
+        component: () => import('@/views/recruit/enterprise/memberCenter/myAccount/index.vue')
       },
       {
-        path: '/enterprise/memberCenter/myPoints',
+        path: '/recruit/enterprise/memberCenter/myPoints',
         meta: {
           title: '我的积分',
           enName: 'My Points '
         },
-        component: () => import('@/views/enterprise/memberCenter/myPoints/index.vue')
+        component: () => import('@/views/recruit/enterprise/memberCenter/myPoints/index.vue')
       }
     ]
   },
   {
-    path: '/enterprise/enterpriseCenter',
+    path: '/recruit/enterprise/enterpriseCenter',
     component: Layout,
     name: 'enterpriseCenter',
     show: true,
-    redirect: '/enterprise/enterpriseCenter',
+    redirect: '/recruit/enterprise/enterpriseCenter',
     meta: {
       title: '企业中心'
     },
     children: [
       {
-        path: '/enterprise/enterpriseCenter',
+        path: '/recruit/enterprise/enterpriseCenter',
         show: true,
-        component: () => import('@/views/enterprise/enterpriseCenter/index.vue'),
+        component: () => import('@/views/recruit/enterprise/enterpriseCenter/index.vue'),
         meta: {
           title: '企业中心',
           hideSide: true
@@ -255,7 +255,7 @@ const enterprise = [
     ]
   },
   {
-    path: '/enterprise/purchasePackage',
+    path: '/recruit/enterprise/purchasePackage',
     component: Layout,
     name: 'enterprisePurchasePackage',
     show: true,
@@ -264,8 +264,8 @@ const enterprise = [
     },
     children: [
       {
-        path: '/enterprise/purchasePackage',
-        component: () => import('@/views/enterprise/purchasePackage/index'),
+        path: '/recruit/enterprise/purchasePackage',
+        component: () => import('@/views/recruit/enterprise/purchasePackage/index'),
         meta: {
           title: '购买套餐',
           hideSide: true

src/router/modules/personal.js

@@ -47,7 +47,7 @@ const personal = [
     ]
   },
   {
-    path: '/resume',
+    path: '/recruit/personal/resume',
     component: Layout,
     name: 'resume',
     meta: {
@@ -55,13 +55,13 @@ const personal = [
     },
     children: [
       {
-        path: '/resume',
-        component: () => import('@/views/resume/index')
+        path: '/recruit/personal/resume',
+        component: () => import('@/views/recruit/personal/remuse/index.vue')
       }
     ]
   },
   {
-    path: '/personalCenter',
+    path: '/recruit/personal/personalCenter',
     component: Layout,
     name: 'personalCenter',
     meta: {
@@ -69,8 +69,8 @@ const personal = [
     },
     children: [
       {
-        path: '/personalCenter',
-        component: () => import('@/views/PersonalCenter/index')
+        path: '/recruit/personal/personalCenter',
+        component: () => import('@/views/recruit/personal/PersonalCenter/index')
       }
     ]
   },

src/router/modules/publicRecruit.js

@@ -43,7 +43,7 @@ const recruit = [
     children: [
       {
         path: '/company/details/:id',
-        component: () => import('@/views/enterprise/components/enterpriseDetails.vue'),
+        component: () => import('@/views/recruit/enterprise/components/enterpriseDetails.vue'),
         meta: {
           title: '企业详情'
         },

src/router/modules/recruit.js

@@ -43,7 +43,7 @@ const recruit = [
     children: [
       {
         path: '/company/details/:id',
-        component: () => import('@/views/enterprise/components/enterpriseDetails.vue'),
+        component: () => import('@/views/recruit/enterprise/components/enterpriseDetails.vue'),
         meta: {
           title: '企业详情'
         },

src/views/login/index.vue

@@ -141,7 +141,7 @@ const handleLogin = async () => {
     // await userStore.handleSmsLogin({ ...phoneRef.value.loginData, type })
     await userStore[api](params)
     Snackbar.success(t('login.loginSuccess'))
-    const path = type === 330 ? '/enterprise' : '/home'
+    const path = type === 330 ? '/recruit/enterprise' : '/home'
     router.push({ path })
   }
   finally {

src/views/personal/components/joiningEnterprise.vue

@@ -89,7 +89,7 @@ const handleCommit = () => {
   // getBasicInfo()
   Snackbar.success(t('common.submittedSuccessfully'))
   setTimeout(() => {
-    router.push({ path: '/enterprise' })
+    router.push({ path: '/recruit/enterprise' })
   }, 3000);
 }
 </script>

src/views/enterprise/memberCenter/myAccount/index.vue → src/views/recruit/enterprise/memberCenter/myAccount/index.vue

@@ -15,7 +15,7 @@
 defineOptions({name: 'enterprise-memberCenter-myAccount'})
 
 const handleToPurchasePackage = () => {
-  window.open('/enterprise/purchasePackage')
+  window.open('/recruit/enterprise/purchasePackage')
 }
 </script>
 

src/views/enterprise/personnelManagement/components/table.vue → src/views/recruit/enterprise/personnelManagement/components/table.vue

@@ -81,7 +81,7 @@ else headers.value = defaultHeaders
 // 人才详情
 const handleToPersonDetail = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/enterprise/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 
 const apiList = [

src/views/enterprise/positionManagement/components/add.vue → src/views/recruit/enterprise/positionManagement/components/add.vue

@@ -62,7 +62,7 @@ const list = [
 // 取消
 const handleCancel = () => {
   itemData.value = {}
-  router.push('/enterprise/position')
+  router.push('/recruit/enterprise/position')
 }
 
 // 发布

src/views/enterprise/positionManagement/components/details.vue → src/views/recruit/enterprise/positionManagement/components/details.vue

@@ -101,7 +101,7 @@ const desc = [
 
 const handleEdit = () => {
   if (!enterprise.value.id) return
-  window.open(`/enterprise/position/edit?id=${enterprise.value.id}`)
+  window.open(`/recruit/enterprise/position/edit?id=${enterprise.value.id}`)
 }
 </script>
 

src/views/enterprise/positionManagement/components/item.vue → src/views/recruit/enterprise/positionManagement/components/item.vue

@@ -149,17 +149,17 @@ const handleAction = async (index, type, { id }) => {
 const router = useRouter()
 // 职位编辑
 const handleEdit = (val) => {
-  router.push(`/enterprise/position/edit?id=${val.id}`)
+  router.push(`/recruit/enterprise/position/edit?id=${val.id}`)
 }
 
 // 职位详情
 const handleDetails = (val) => {
-  window.open(`/enterprise/position/details/${val.id}`)
+  window.open(`/recruit/enterprise/position/details/${val.id}`)
 }
 
 // 跳转招聘统计
 const handleToStatistics = () => {
-  router.push('/enterprise/statistics/overallAnalysis')
+  router.push('/recruit/enterprise/statistics/overallAnalysis')
 }
 </script>
 

src/views/enterprise/positionManagement/index.vue → src/views/recruit/enterprise/positionManagement/index.vue

@@ -66,7 +66,7 @@ const textItem = ref({
 })
 
 const handleAdd = () => {
-  router.push('/enterprise/position/add')
+  router.push('/recruit/enterprise/position/add')
 }
 
 // 获取职位列表

src/views/enterprise/talentPool/index.vue → src/views/recruit/enterprise/talentPool/index.vue

@@ -235,7 +235,7 @@ const handleChangePage = () => {
 // 人才详情
 const talentPoolDetails = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/enterprise/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 </script>
 

src/views/PersonalCenter/dynamic/left.vue → src/views/recruit/personal/PersonalCenter/dynamic/left.vue

@@ -46,7 +46,7 @@
         <div class="mt-3">{{ $t('resume.currentAddress') }}： {{ baseInfo?.areaName || $t('common.currentlyUnavailable') }}</div>
       </div>
       <div class="slider-btn">
-        <v-btn class="slider-btn-item" rounded variant="outlined" color="primary" append-icon="mdi-menu-right" to="/resume">{{ $t('resume.onlineResume') }}</v-btn>
+        <v-btn class="slider-btn-item" rounded variant="outlined" color="primary" append-icon="mdi-menu-right" to="/recruit/personal/resume">{{ $t('resume.onlineResume') }}</v-btn>
       </div>
     </div>
 

src/views/recruit/position/components/details.vue

@@ -17,7 +17,7 @@
       </div>
       <div class="d-flex justify-end mb-5">
         <div class="banner-tools-btns">
-          <v-btn class="radius mr-2" variant="outlined" color="error" prepend-icon="mdi-share-outline" style="width: 187px; height: 36px;">分享有礼</v-btn>
+          <v-btn class="radius mr-2 button-item" variant="outlined" color="error" prepend-icon="mdi-share-outline" style="height: 36px;">分享有礼</v-btn>
           <v-btn
             class="button-item radius"
             color="warning" 
@@ -170,7 +170,7 @@ const showResume = ref(false)
 // 去上传附件
 const handleToUpload = () => {
   dialog.value = false
-  window.open('/personalCenter')
+  window.open('/recruit/personal/personalCenter')
 }
 
 // 效验是否有投递简历