浏览代码

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

Xiao_123 1 年之前
父节点
当前提交
95e8051e61
共有 3 个文件被更改,包括 15 次插入9 次删除
  1. 1 1
      .env.localDev
  2. 2 2
      src/api/personal/user.js
  3. 12 6
      src/layout/personal/navBar.vue

+ 1 - 1
.env.localDev

@@ -1,4 +1,4 @@
-NODE_ENV = 'local'
+NODE_ENV = 'localDev'
 
 VITE_APP_TITLE = 门墩儿直聘
 

+ 2 - 2
src/api/personal/user.js

@@ -11,7 +11,7 @@ export const getUserInfo = async (params) => {
 // 获取当前用户绑定的企业列表
 export const getUserBindEnterpriseList = async (params) => {
   return await request.get({
-    url: '/app-api/menduner/system/enterprise-user-bind/get/user',
+    url: '/app-admin-api/menduner/system/enterprise-user-bind/get/user',
     params
   })
 }
@@ -27,7 +27,7 @@ export const enterpriseRegisterApply = async (data) => {
 // 获取当前用户提交的企业申请
 export const getUserRegisterEnterpriseApply = async (params) => {
   return await request.get({
-    url: '/app-api/menduner/system/enterprise-register/by/user',
+    url: '/app-admin-api/menduner/system/enterprise-register/by/user',
     params
   })
 }

+ 12 - 6
src/layout/personal/navBar.vue

@@ -127,10 +127,11 @@ const handleLogoClick = () => { router.push({ path: '/home'}) }
 
 // 查看用户是否有企业
 const changeLoginType = async () => {
-  // const data = await getUserBindEnterpriseList()
+  // router.push({ path: '/login' })
+  // router.push({ name: 'login', query: { loginType: 330 } })
+
   const data = await getUserBindEnterpriseList() // 申请通过才会数据,否则空数组
-  // if (data?.length) router.push({ path: '/enterprise' })
-  if (data?.length) handleLogout(330)
+  if (data?.length) changeRole()
   else getApplyInfo()
 }
 
@@ -148,16 +149,21 @@ const handleToPersonalCenter = () => {
 }
 
 // 退出登录
-const handleLogout = async (num = 0) => {
+const handleLogout = async () => {
   // try {
     await userStore.userLogout()
-    if (num === 330) router.push({ name: 'login', query: { loginType: num } })
-    else router.push({ path: '/login' })
+    router.push({ path: '/login' })
   // } catch (error) {
   //   console.log(error, 'error')
   // }
 }
 
+// 切换为招聘者
+const changeRole = async () => {
+  await userStore.userLogout()
+  router.push({ name: 'login', query: { loginType: 330 } })
+}
+
 const items = ref([
   { title: '在线简历', icon: 'mdi-list-box-outline', change: () => router.push({ path: '/resume' }) },
   { title: '账号设置', icon: 'mdi-cog-outline', change: () => router.push({ path: '/personalAccount/accountBinding' }) },