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

src/api/common/index.js

@@ -27,7 +27,7 @@ export const smsLogin = async (data) => {
 // 切换登录
 export const switchLoginOfEnterprise = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/auth/switch-login',
+    url: '/app-api/menduner/system/recruit/enterprise/auth/switch-login',
     data
   })
 }
@@ -35,7 +35,7 @@ export const switchLoginOfEnterprise = async (data) => {
 // 企业-验证码登录
 export const smsLoginOfEnterprise = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/auth/sms-login',
+    url: '/app-api/menduner/system/recruit/enterprise/auth/sms-login',
     data
   })
 }
@@ -43,7 +43,7 @@ export const smsLoginOfEnterprise = async (data) => {
 // 企业-密码登录
 export const passwordLoginOfEnterprise = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/auth/login',
+    url: '/app-api/menduner/system/recruit/enterprise/auth/login',
     data
   })
 }
@@ -67,7 +67,7 @@ export const logout = async () => {
 // 根据令牌退出登录
 export const logoutToken = async (token) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/enterprise/auth/logout-token?token=${token}`
+    url: `/app-api/menduner/system/recruit/enterprise/auth/logout-token?token=${token}`
   })
 }
 
@@ -189,7 +189,7 @@ export const uploadFile = async (data) => {
 // 获取当前登录的企业用户信息
 export const getEnterprisingUserInfo = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/user/get',
+    url: '/app-api/menduner/system/recruit/user/get',
     params
   })
 }
@@ -197,7 +197,7 @@ export const getEnterprisingUserInfo = async (params) => {
 // 招聘端-刷新令牌token
 export const enterpriseRefreshToken = async (refreshToken) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/enterprise/auth/refresh-token?refreshToken=${refreshToken}`
+    url: `/app-api/menduner/system/recruit/enterprise/auth/refresh-token?refreshToken=${refreshToken}`
   })
 }
 
@@ -211,7 +211,7 @@ export const userRefreshToken = async (refreshToken) => {
 // 招聘端-企业账户信息（积分&余额）
 export const getEnterpriseUserAccount = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/user/get/account'
+    url: '/app-api/menduner/system/recruit/user/get/account'
   })
 }
 
@@ -276,7 +276,7 @@ export const getEnableCodeList = async (params) => {
 // 获取待支付的订单
 export const getUnpaidOrder = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/trade/order/get/unpaid',
+    url: '/app-api/menduner/system/recruit/trade/order/get/unpaid',
     params
   })
 }
@@ -284,7 +284,7 @@ export const getUnpaidOrder = async (params) => {
 // 提交支付订单
 export const payOrderSubmit = async (data) => {
   return await request.post({
-    // url: '/app-admin-api/menduner/system/pay/order/submit',
+    // url: '/app-api/menduner/system/recruit/pay/order/submit',
     url: '/app-admin-api/pay/order/submit',
     data
   })

src/api/enterprise.js

@@ -58,7 +58,7 @@ export const enterpriseClick = async (data) => {
 // 招聘端-牛人管理-列表
 export const getPersonCvPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/person-cv/page',
+    url: '/app-api/menduner/system/recruit/person-cv/page',
     params
   })
 }
@@ -66,7 +66,7 @@ export const getPersonCvPage = async (params) => {
 // 招聘端-牛人管理-获取发布的职位列表
 export const getJobAdvertised = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/job-advertised/list',
+    url: '/app-api/menduner/system/recruit/job-advertised/list',
     params
   })
 }
@@ -74,7 +74,7 @@ export const getJobAdvertised = async (params) => {
 // 招聘端-保存用户基本信息
 export const saveUserInfo = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/user/save',
+    url: '/app-api/menduner/system/recruit/user/save',
     data
   })
 }
@@ -82,21 +82,21 @@ export const saveUserInfo = async (data) => {
 // 招聘端-获取人才的在线简历详情
 export const getPersonCvDetail = async (userId, id) => {
   return await request.get({
-    url: `/app-admin-api/menduner/system/person-cv/detail?userId=${userId}&id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/detail?userId=${userId}&id=${id}`
   })
 }
 
 // 招聘端-企业信息-获取基本信息
 export const getEnterpriseBaseInfo = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise/get'
+    url: '/app-api/menduner/system/recruit/enterprise/get'
   })
 }
 
 // 招聘端-企业信息-修改基本信息
 export const updateEnterpriseBaseInfo = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/update',
+    url: '/app-api/menduner/system/recruit/enterprise/update',
     data
   })
 }
@@ -104,7 +104,7 @@ export const updateEnterpriseBaseInfo = async (data) => {
 // 招聘端-企业信息-修改企业相册
 export const updateEnterpriseAlbum = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/album/update',
+    url: '/app-api/menduner/system/recruit/enterprise/album/update',
     data
   })
 }
@@ -112,7 +112,7 @@ export const updateEnterpriseAlbum = async (data) => {
 // 招聘端-企业信息-修改营业执照信息
 export const updateEnterpriseBusiness = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/business/update',
+    url: '/app-api/menduner/system/recruit/enterprise/business/update',
     data
   })
 }
@@ -120,7 +120,7 @@ export const updateEnterpriseBusiness = async (data) => {
 // 招聘端-企业信息-获取营业执照信息
 export const getEnterpriseBusiness = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise/business/get',
+    url: '/app-api/menduner/system/recruit/enterprise/business/get',
     params
   })
 }
@@ -128,14 +128,14 @@ export const getEnterpriseBusiness = async (params) => {
 // 招聘端-企业信息-修改企业logo
 export const updateEnterpriseLogo = async (url) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/enterprise/logo/update?logoUrl=${url}`
+    url: `/app-api/menduner/system/recruit/enterprise/logo/update?logoUrl=${url}`
   })
 }
 
 // // 招聘端-企业信息-获取企业福利标签
 // export const getEnterpriseWelfare = async (params) => {
 //   return await request.get({
-//     url: '/app-admin-api/menduner/system/enterprise/welfare/get',
+//     url: '/app-api/menduner/system/recruit/enterprise/welfare/get',
 //     params
 //   })
 // }
@@ -143,7 +143,7 @@ export const updateEnterpriseLogo = async (url) => {
 // 招聘端-企业信息-修改企业福利标签
 export const updateEnterpriseWelfare = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/welfare/update',
+    url: '/app-api/menduner/system/recruit/enterprise/welfare/update',
     data
   })
 }
@@ -151,7 +151,7 @@ export const updateEnterpriseWelfare = async (data) => {
 // 招聘端-企业信息-修改企业标签
 export const updateEnterpriseTag = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/tag/update',
+    url: '/app-api/menduner/system/recruit/enterprise/tag/update',
     data
   })
 }

src/api/position.js

@@ -147,7 +147,7 @@ export const getPersonEnterpriseSubscribeCount = async (params) => {
 // 招聘端-发布职位
 export const saveJobAdvertised = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/job-advertised/save',
+    url: '/app-api/menduner/system/recruit/job-advertised/save',
     data
   })
 }
@@ -155,7 +155,7 @@ export const saveJobAdvertised = async (data) => {
 // 创建订单
 export const createTradeOrder = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/trade/order/create',
+    url: '/app-api/menduner/system/recruit/trade/order/create',
     data
   })
 }
@@ -163,7 +163,7 @@ export const createTradeOrder = async (data) => {
 // 招聘端-职位列表
 export const getJobAdvertisedList = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/job-advertised/page',
+    url: '/app-api/menduner/system/recruit/job-advertised/page',
     params
   })
 }
@@ -171,7 +171,7 @@ export const getJobAdvertisedList = async (params) => {
 // 招聘端-发布职位详情
 export const getJobDetails = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/job-advertised/detail',
+    url: '/app-api/menduner/system/recruit/job-advertised/detail',
     params
   })
 }
@@ -179,28 +179,28 @@ export const getJobDetails = async (params) => {
 // 招聘端-刷新职位
 export const refreshJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/refresh?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/job-advertised/refresh?ids=${ids}`
   })
 }
 
 // 招聘端-开启职位
 export const enableJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/enable?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/job-advertised/enable?ids=${ids}`
   })
 }
 
 // 招聘端-关闭职位
 export const closeJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/disable?ids=${ids}`,
+    url: `/app-api/menduner/system/recruit/job-advertised/disable?ids=${ids}`,
   })
 }
 
 // 招聘端-置顶职位
 export const topJobAdvertised = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/job-advertised/top?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/job-advertised/top?ids=${ids}`
   })
 }
 

src/api/recruit/enterprise/enterpriseInvite.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 生成邀请码标识
 export const enterpriseInviteGenerateCode = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise-invite/generate/code',
+    url: '/app-api/menduner/system/recruit/enterprise-invite/generate/code',
     data
   })
 }
@@ -11,7 +11,7 @@ export const enterpriseInviteGenerateCode = async (data) => {
 // 获取邀请码
 export const enterpriseInviteGetCode = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise-invite/get/code',
+    url: '/app-api/menduner/system/recruit/enterprise-invite/get/code',
     params
   })
 }
@@ -19,21 +19,21 @@ export const enterpriseInviteGetCode = async (params) => {
 // 刷新邀请码
 export const enterpriseInviteRefresh = async (code) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise-invite/refresh?code=' + code
+    url: '/app-api/menduner/system/recruit/enterprise-invite/refresh?code=' + code
   })
 }
 
 // 同意加入
 export const enterpriseInviteRecordConsent = async (code) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/enterprise-invite-record/consent?code=${code}`
+    url: `/app-api/menduner/system/recruit/enterprise-invite-record/consent?code=${code}`
   })
 }
 
 // 获得企业邀请记录分页
 export const enterpriseInviteRecordPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise-invite-record/page',
+    url: '/app-api/menduner/system/recruit/enterprise-invite-record/page',
     params
   })
 }
@@ -41,7 +41,7 @@ export const enterpriseInviteRecordPage = async (params) => {
 // 获得企业邀请记录分页
 export const getEnterpriseInfoByCode = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise-invite/get/info/by/code',
+    url: '/app-api/menduner/system/recruit/enterprise-invite/get/info/by/code',
     params
   })
 }

src/api/recruit/enterprise/information/index.js

@@ -3,14 +3,14 @@ import request from '@/config/axios'
 // 获取企业实名认证信息
 export const getEnterpriseAuth = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise/get/auth'
+    url: '/app-api/menduner/system/recruit/enterprise/get/auth'
   })
 }
 
 // 实名认证
 export const saveEnterpriseAuth = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise/auth/save',
+    url: '/app-api/menduner/system/recruit/enterprise/auth/save',
     data
   })
 }

src/api/recruit/enterprise/interview/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 获取当前企业用户的面试信息分页
 export const getInterviewInvitePage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/interview-invite/page',
+    url: '/app-api/menduner/system/recruit/interview-invite/page',
     params
   })
 }
@@ -11,7 +11,7 @@ export const getInterviewInvitePage = async (params) => {
 // 面试-保存、重新邀约
 export const saveInterviewInvite = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/interview-invite/save',
+    url: '/app-api/menduner/system/recruit/interview-invite/save',
     data
   })
 }
@@ -19,7 +19,7 @@ export const saveInterviewInvite = async (data) => {
 // 取消面试
 export const cancelInterviewInvite = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/interview-invite/cancellation',
+    url: '/app-api/menduner/system/recruit/interview-invite/cancellation',
     data
   })
 }
@@ -27,14 +27,14 @@ export const cancelInterviewInvite = async (data) => {
 // 完成面试
 export const completedInterviewInvite = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/interview-invite/completed?id=${id}`
+    url: `/app-api/menduner/system/recruit/interview-invite/completed?id=${id}`
   })
 }
 
 // 未能爽约面试
 export const noAttendInterviewInvite = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/interview-invite/not/attended',
+    url: '/app-api/menduner/system/recruit/interview-invite/not/attended',
     data
   })
 }
@@ -42,7 +42,7 @@ export const noAttendInterviewInvite = async (data) => {
 // 面试反馈
 export const feedbackInterviewInvite = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/interview-invite/feedback',
+    url: '/app-api/menduner/system/recruit/interview-invite/feedback',
     data
   })
 }
@@ -50,6 +50,6 @@ export const feedbackInterviewInvite = async (data) => {
 // 获取当前企业有面试的日期列表
 export const getEnterpriseInterviewCountByTime = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/interview-invite/get/count/by/time'
+    url: '/app-api/menduner/system/recruit/interview-invite/get/count/by/time'
   })
 }

src/api/recruit/enterprise/member/points/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 账户变动记录
 export const getEnterpriseAccountRecordPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise/account/record/page',
+    url: '/app-api/menduner/system/recruit/enterprise/account/record/page',
     params
   })
 }
@@ -11,7 +11,7 @@ export const getEnterpriseAccountRecordPage = async (params) => {
 // 账户变动记录
 export const getEnterpriseTradeOrderPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/trade/order/page',
+    url: '/app-api/menduner/system/recruit/trade/order/page',
     params
   })
 }

src/api/recruit/enterprise/personnel/index.js

@@ -3,14 +3,14 @@ import request from '@/config/axios'
 // 记录查看简历附件
 export const personJobCvLook = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/look?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/look?id=${id}`
   })
 }
 
 // 招聘端-牛人管理-加入不合适
 export const joinEliminate = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/person-cv/unfit/eliminate',
+    url: '/app-api/menduner/system/recruit/person-cv/unfit/eliminate',
     data
   })
 }
@@ -18,14 +18,14 @@ export const joinEliminate = async (data) => {
 // 招聘端-牛人管理-入职
 export const personEntryByEnterprise = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/entry?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/entry?id=${id}`
   })
 }
 
 // 招聘端-牛人管理-不合适
 export const personCvUnfitPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/person-cv/unfitPage',
+    url: '/app-api/menduner/system/recruit/person-cv/unfitPage',
     params
   })
 }
@@ -33,6 +33,6 @@ export const personCvUnfitPage = async (params) => {
 // 招聘端-牛人管理-取消不合适
 export const personCvUnfitCancel = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/unfit/cancellation?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/unfit/cancellation?id=${id}`
   })
 }

src/api/recruit/enterprise/statistics/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 获取投递简历的年龄分布
 export const getJobCvAgeCount = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/analysis/get/job/cv/age/count',
+    url: '/app-api/menduner/system/recruit/analysis/get/job/cv/age/count',
     params
   })
 }
@@ -11,7 +11,7 @@ export const getJobCvAgeCount = async (params) => {
 // 获取投递简历的学历分布
 export const getJobCvEduCount = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/analysis/get/job/cv/edu/count',
+    url: '/app-api/menduner/system/recruit/analysis/get/job/cv/edu/count',
     params
   })
 }
@@ -19,7 +19,7 @@ export const getJobCvEduCount = async (params) => {
 // 获取投递简历的工作经验分布
 export const getJobCvExpCount = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/analysis/get/job/cv/exp/count',
+    url: '/app-api/menduner/system/recruit/analysis/get/job/cv/exp/count',
     params
   })
 }
@@ -27,7 +27,7 @@ export const getJobCvExpCount = async (params) => {
 // 获取投递简历的性别分布
 export const getJobCvSexCount = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/analysis/get/job/cv/sex/count',
+    url: '/app-api/menduner/system/recruit/analysis/get/job/cv/sex/count',
     params
   })
 }

src/api/recruit/enterprise/system/group/index.js

@@ -3,6 +3,6 @@ import request from '@/config/axios'
 // 企业树形
 export const getEnterpriseTree = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise/get/tree'
+    url: '/app-api/menduner/system/recruit/enterprise/get/tree'
   })
 }

src/api/recruit/enterprise/system/post/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 岗位列表分页
 export const getEnterprisePostPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/enterprise-post/page',
+    url: '/app-api/menduner/system/recruit/enterprise-post/page',
     params
   })
 }
@@ -11,14 +11,14 @@ export const getEnterprisePostPage = async (params) => {
 // 岗位详情
 export const getEnterprisePostDetail = async (id) => {
   return await request.get({
-    url: `/app-admin-api/menduner/system/enterprise-post/get?id=${id}`
+    url: `/app-api/menduner/system/recruit/enterprise-post/get?id=${id}`
   })
 }
 
 // 岗位新增
 export const createEnterprisePost = async (data) => {
   return await request.post({
-    url: '/app-admin-api/menduner/system/enterprise-post/create',
+    url: '/app-api/menduner/system/recruit/enterprise-post/create',
     data
   })
 }
@@ -26,7 +26,7 @@ export const createEnterprisePost = async (data) => {
 // 岗位更新
 export const updateEnterprisePost = async (data) => {
   return await request.put({
-    url: '/app-admin-api/menduner/system/enterprise-post/update',
+    url: '/app-api/menduner/system/recruit/enterprise-post/update',
     data
   })
 }
@@ -34,13 +34,13 @@ export const updateEnterprisePost = async (data) => {
 // 岗位删除
 export const deleteEnterprisePost = async (id) => {
   return await request.delete({
-    url: `/app-admin-api/menduner/system/enterprise-post/delete?id=${id}`
+    url: `/app-api/menduner/system/recruit/enterprise-post/delete?id=${id}`
   })
 }
 
 // 效验岗位下是否绑定用户
 export const checkPost = async (postId) => {
   return await request.get({
-    url: `/app-admin-api/menduner/system/user/check/post?postId=${postId}`
+    url: `/app-api/menduner/system/recruit/user/check/post?postId=${postId}`
   })
 }

src/api/recruit/enterprise/system/user/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 列表
 export const getEnterpriseUserList = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/user/page',
+    url: '/app-api/menduner/system/recruit/user/page',
     params
   })
 }
@@ -11,20 +11,20 @@ export const getEnterpriseUserList = async (params) => {
 // 启用账户
 export const systemUserEnable = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/user/enable?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/user/enable?ids=${ids}`
   })
 }
 
 // 禁用账户
 export const systemUserDisable = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/user/disable?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/user/disable?ids=${ids}`
   })
 }
 
 // 绑定用户的岗位
 export const systemUserBindingPost = async (id, postId) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/user/bind/post?id=${id}&postId=${postId}`
+    url: `/app-api/menduner/system/recruit/user/bind/post?id=${id}&postId=${postId}`
   })
 }

src/api/recruit/public/commission/index.js

@@ -3,13 +3,13 @@ import request from '@/config/axios'
 // 获取佣金比例
 export const getHireCommissionRatio = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/hire-commission-ratio/get'
+    url: '/app-api/menduner/system/recruit/hire-commission-ratio/get'
   })
 }
 
 // 修改佣金比例
 export const updateHireCommissionRatio = async (rate) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/hire-commission-ratio/update?rate=${rate}`
+    url: `/app-api/menduner/system/recruit/hire-commission-ratio/update?rate=${rate}`
   })
 }

src/api/recruit/public/delivery/index.js

@@ -3,7 +3,7 @@ import request from '@/config/axios'
 // 获取投递分页列表
 export const getHireJobCvPage = async (params) => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/person-cv/hire/page',
+    url: '/app-api/menduner/system/recruit/person-cv/hire/page',
     params
   })
 }
@@ -11,34 +11,34 @@ export const getHireJobCvPage = async (params) => {
 // 获取推荐人的用户列表
 export const getHireJobCvRelRecommendList = async () => {
   return await request.get({
-    url: '/app-admin-api/menduner/system/hire-job-cv-rel/recommend/list'
+    url: '/app-api/menduner/system/recruit/hire-job-cv-rel/recommend/list'
   })
 }
 
 // 结算
 export const hireJobCvRelSettlement = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/settlement?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/settlement?id=${id}`
   })
 }
 
 // 入职
 export const hireJobCvRelEntry = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/entry?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/entry?id=${id}`
   })
 }
 
 // 淘汰、不合适
 export const hireJobCvRelEliminate = async (ids) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/eliminate?ids=${ids}`
+    url: `/app-api/menduner/system/recruit/person-cv/eliminate?ids=${ids}`
   })
 }
 
 // 记录查看简历附件
 export const hireJobCvRelLook = async (id) => {
   return await request.post({
-    url: `/app-admin-api/menduner/system/person-cv/look?id=${id}`
+    url: `/app-api/menduner/system/recruit/person-cv/look?id=${id}`
   })
 }

src/components/Loading/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-overlay :model-value="visible" class="align-center justify-center" :close-on-content-click="false" :disabled="true">
+  <v-overlay :model-value="visible" class="align-center justify-center" :close-on-content-click="false" :disabled="true" :contained="contained">
     <div class="loader"></div>
   </v-overlay>
 </template>
@@ -8,7 +8,8 @@
 defineOptions({ name: 'LoadingPage'})
 
 defineProps({
-  visible: Boolean
+  visible: Boolean,
+  contained: Boolean
 })
 </script>
 

src/hooks/web/useIM.js

@@ -203,7 +203,7 @@ export const useIM = () => {
   })
   
   async function messageListen (message) {
-    console.log('收到消息', message)
+    // console.log('收到消息', message)
     IM.setFromChannel(message.channel.channelID)
     setUnreadCount()
   }

src/views/recruit/components/message/components/chatting.vue

@@ -31,7 +31,7 @@
             <span>{{ val.job.name }}</span>
             <span class="ml-3">{{ val.job.payFrom }}-{{ val.job.payTo }}</span>
           </div>
-          <div :style="{'color': ['5', '98', '99'].includes(val.status) ? 'var(--v-error-base)' : 'var(--v-primary-base)'}">{{ statusList.find(e => e.value === val.status).label }}</div>
+          <div :style="{'color': ['5', '98', '99'].includes(val.status) ? 'var(--v-error-base)' : 'var(--v-primary-base)'}">{{ statusList.find(e => e.value === val.status)?.label }}</div>
         </div>
         <div class="mt-1 font-size-14 ellipsis" style="max-width: 100%;">
           <span>面试时间：{{ timesTampChange(val.time, 'Y-M-D h:m') }}</span>
@@ -221,7 +221,7 @@
 
 <script setup>
 defineOptions({ name: 'message-chatting'})
-import { ref, nextTick, onMounted, inject } from 'vue'
+import { ref, nextTick, onMounted, inject, watch } from 'vue'
 import { timesTampChange } from '@/utils/date'
 import { useIMStore } from '@/store/im'
 import { useI18n } from '@/hooks/web/useI18n'
@@ -236,7 +236,7 @@ const { t } = useI18n()
 
 const emits = defineEmits(['handleMore', 'handleSend', 'handleAgree', 'handleRefuse'])
 
-defineProps({
+const props = defineProps({
   items: {
     type: Array,
     default: () => []
@@ -256,9 +256,28 @@ defineProps({
   interview: {
     type: Array,
     default: () => []
+  },
+  updateConversation: {
+    type: Function,
+    default: () => {}
+  },
+  updateUnreadCount: {
+    type: Function,
+    default: () => {}
+  },
+  resetUnread: {
+    type: Function,
+    default: () => {}
   }
 })
 
+watch(() => props.info, async (val) => {
+  if (!Object.keys(val).length || val.unread === 0) return
+  await props.resetUnread(val.channel, isEnterprise ? val.enterpriseId : null)
+  await props.updateConversation()
+  props.updateUnreadCount()
+}, { deep: true, immediate: true })
+
 const router = useRouter()
 const overlay = ref(false)
 const IM = useIMStore()

src/views/recruit/components/message/index.vue

@@ -88,6 +88,9 @@
         :info="info"
         :interview="interview"
         :has-more="hasMore"
+        :updateConversation="updateConversation"
+        :updateUnreadCount="updateUnreadCount"
+        :resetUnread="resetUnread"
         @handleSend="handleUpdate"
         @handleMore="handleGetMore"
         @handleAgree="handleAgree"
@@ -262,16 +265,23 @@ const getInterviewInviteList = async () => {
   interview.value = data.slice(0, 1)
 }
 
+// 在当前频道中有新消息时更新未读消息数量
+const updateUnreadMessageCount = (val) => {
+  const obj = val.find(e => e.userInfoVo.userId === info.value.userId)
+  if (!obj?.unread || obj.unread === 0) return
+  delete info.value.unread
+  Object.assign(info.value, { unread: obj.unread, enterpriseId: baseInfo?.enterpriseId })
+}
+
 watch(
   () => conversationList.value,
-  async () => {
-    // console.log('发生变化', val)
+  async (val) => {
     // 数据发生变化
     if (channelItem.value && IM.fromChannel === channelItem.value.channelID) {
       // 更新
       const { list } = await getMoreMessages(1, channelItem.value)
       messageItems.value = list.value
-      if (!isEnterprise) getInterviewInviteList()
+      if (Object.keys(info.value).length) updateUnreadMessageCount(val)
       chatRef.value.scrollBottom()
     }
   },
@@ -286,11 +296,14 @@ async function handleChange (items) {
   // console.log([...items])
   try {
     chatRef.value.changeOverlay(true)
-    const { userInfoVo, channel: myChannel } = items.pop()
+    const { userInfoVo, channel: myChannel, unread } = items.pop()
     info.value = userInfoVo?.userInfoResp ?? { name: '系统消息' }
     Object.assign(info.value, {
-      channel: myChannel
+      channel: myChannel,
+      unread
     })
+    // 个人端获取面试信息
+    if (!isEnterprise) getInterviewInviteList()
     const userId = userInfoVo.userInfoResp.userId
     const enterpriseId = userInfoVo.userInfoResp.enterpriseId || undefined
     const { channel, list, more } = await initChart(userId, enterpriseId)
@@ -303,7 +316,6 @@ async function handleChange (items) {
     await resetUnread(channel.value, baseInfo?.enterpriseId)
     await updateConversation()
     updateUnreadCount()
-    if (!isEnterprise) getInterviewInviteList()
   } catch (error) {
     messageItems.value = []
   } finally {

src/views/recruit/enterprise/informationManagement/informationSettings.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <v-card class="card-box pa-5" style="min-height: 500px">
-      <v-tabs v-model="tab" @update:model-value="handleTabClick" align-tabs="start" color="primary" bg-color="#fff">
+      <v-tabs v-model="tab" @update:model-value="handleTabClick" align-tabs="start" color="primary" bg-color="#f7f8fa">
         <v-tab v-for="val in tabList" :key="val.value" :value="val.value">{{ val.label }}</v-tab>
       </v-tabs>
       <v-window v-model="tab" class="mt-3">

src/views/recruit/enterprise/informationManagement/informationSettingsComponents/basicInfo.vue

@@ -134,7 +134,8 @@ const formItems = ref({
       value: null,
       col: 6,
       class: 'mb-3',
-      label: '上班时间(示例：上午09:00 - 下午17:00)'
+      label: '上班时间(示例：上午09:00 - 下午17:00)',
+      placeholder: '请输入上班时间'
     },
     {
       type: 'datePicker',

src/views/recruit/enterprise/informationManagement/informationSettingsComponents/businessInformation.vue

@@ -1,8 +1,7 @@
 <!-- 工商信息 -->
 <template>
   <div>
-    <CtForm ref="CtFormRef" class="mt-3" :items="formItems" style="width: 900px;margin: 0 auto">
-    </CtForm>
+    <CtForm ref="CtFormRef" class="mt-3" :items="formItems" style="width: 900px;margin: 0 auto"></CtForm>
     <div class="text-center">
       <v-btn color="primary" class="buttons mt-3 mb-10" @click="handleSave">{{ $t('common.save') }}</v-btn>
     </div>
@@ -13,8 +12,8 @@
 import CtForm from '@/components/CtForm'
 import { getEnterpriseBusiness, updateEnterpriseBusiness } from '@/api/enterprise'
 import Snackbar from '@/plugins/snackbar'
-
 import { reactive, ref } from 'vue'
+import { getDict } from '@/hooks/web/useDictionaries'
 
 defineOptions({name: 'informationSettingsComponents-businessInformation'})
 const formItems = ref({
@@ -46,12 +45,18 @@ const formItems = ref({
       rules: [v => !!v || '请输入统一社会信用代码']
     },
     {
-      type: 'text',
+      type: 'autocomplete',
       key: 'type',
-      value: '',
-      col: 6,
+      value: null,
       label: '企业类型 *',
-      rules: [v => !!v || '请输入企业类型']
+      outlined: true,
+      clearable: false,
+      itemText: 'label',
+      itemValue: 'value',
+      col: 6,
+      dictTypeName: 'menduner_enterprise_type',
+      rules: [v => !!v || '请输入企业类型'],
+      items: []
     },
     {
       type: 'datePicker',
@@ -70,6 +75,7 @@ const formItems = ref({
       key: 'registeredCapital',
       value: '',
       col: 6,
+      suffix: '万元',
       label: '注册资金 *',
       rules: [v => !!v || '请输入注册资金']
     },
@@ -169,6 +175,13 @@ const getBaseInfo = async () => {
   })
 }
 getBaseInfo()
+
+// 企业类型字典数据
+const obj = formItems.value.options.find(e => e.key === 'type')
+getDict(obj.dictTypeName).then(({ data }) => {
+  data = data?.length && data || []
+  obj.items = data
+})
 </script>
 <style lang="scss" scoped>
 </style>

src/views/recruit/personal/company/components/natureType.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="d-flex">
-    <div class="label-title">企业性质</div>
+    <div class="label-title">企业类型</div>
     <div class="label-content">
       <span 
         v-for="k in items" 

src/views/recruit/personal/company/index.vue

@@ -73,7 +73,7 @@ const handleSearch = async (val, key) => {
 const getCompanyData = async () => {
   const { list, total: number } = await getEnterpriseSearch(query.value)
   if (!list.length) {
-    list.value = []
+    items.value = []
     total.value = 0
     return
   }