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

src/components/Enterprise/hotPromoted.vue

@@ -1,33 +1,35 @@
 <template>
   <div class="hot-box">
-    <div class="sub-li" v-for="(item, index) in list" :key="index">
-      <!-- 公司信息 -->
-      <div class="company-info-top" @click="handleClickEnterprise(item)">
-        <div class="float-left">
-          <v-img :src="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
-        </div>
-        <div class="company-info">
-          <h3>{{ item.enterprise.anotherName }}</h3>
-          <p>{{ item.financingName }}<span class="vline"></span>{{ item.scaleName }}<span class="vline"></span>{{ item.industryName }}</p>
+    <div class="sub-li" v-for="(item, index) in list" :key="index" >
+      <div v-if="item">
+        <!-- 公司信息 -->
+        <div class="company-info-top" @click="handleClickEnterprise(item)">
+          <div class="float-left">
+            <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
+          </div>
+          <div class="company-info">
+            <h3>{{ item.enterprise.anotherName }}</h3>
+            <p>{{ item.financingName }}<span class="vline"></span>{{ item.scaleName }}<span class="vline"></span>{{ item.industryName }}</p>
+          </div>
         </div>
-      </div>
-      <!-- 职位列表 -->
-      <ul class="company-job-list">
-        <li class="company-job-item" v-for="(k, i) in item.jobList" :key="i">
-          <div class="job-info" @mouseenter="k.active = true" @mouseleave="k.active = false" @click="handleClickPosition(k)">
-            <div class="mb-2 d-flex">
-              <p :class="['name', {'default-active': k.active }]">{{ k.name }}</p>
-              <v-icon size="20" class="message">mdi-message-processing</v-icon>
-              <span class="salary">{{ k.payFrom }}-{{ k.payTo }}/{{ k.payName }}</span>
+        <!-- 职位列表 -->
+        <ul class="company-job-list">
+          <li class="company-job-item" v-for="(k, i) in item.jobList" :key="i">
+            <div class="job-info" @mouseenter="k.active = true" @mouseleave="k.active = false" @click="handleClickPosition(k)">
+              <div class="mb-2 d-flex">
+                <p :class="['name', {'default-active': k.active }]">{{ k.name }}</p>
+                <v-icon size="20" class="message">mdi-message-processing</v-icon>
+                <span class="salary">{{ k.payFrom }}-{{ k.payTo }}/{{ k.payName }}</span>
+              </div>
+              <div style="height: 24px; overflow: hidden;">
+                <v-chip size="x-small" label class="mr-1" color="#666" v-for="j in desc" :key="j">{{ k[j.value] }}</v-chip>
+              </div>
             </div>
-            <div style="height: 24px; overflow: hidden;">
-              <v-chip size="x-small" label class="mr-1" color="#666" v-for="j in desc" :key="j">{{ k[j.value] }}</v-chip>
-            </div>
-          </div>
-        </li>
-      </ul>
-      <div class="moreBtn">
-        <v-btn class="buttons" color="primary" variant="outlined" @click="handleMoreEnterprise(item)">{{ $t('position.moreBtn') }}</v-btn>
+          </li>
+        </ul>
+        <div class="moreBtn">
+          <v-btn class="buttons" color="primary" variant="outlined" @click="handleMoreEnterprise(item)">{{ $t('position.moreBtn') }}</v-btn>
+        </div>
       </div>
     </div>
   </div>

src/components/PositionLongStrip/item.vue

@@ -16,7 +16,7 @@
       <!-- 公司 -->
       <div class="company" @click="handleEnterprise(item)">
         <div class="float-left">
-          <v-img :src="item.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
+          <v-img :src="item?.enterprise.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" :alt="item.enterprise.anotherName" :width="40" style="height: 40px;border-radius: 4px;"/>
         </div>
         <div class="company-info">
           <v-hover>

src/layout/company/navBar.vue

@@ -13,7 +13,7 @@
         </div>
         
         <div class="d-flex user-nav">
-          <div class="d-flex align-center cursor-pointer">
+          <div class="d-flex align-center cursor-pointer" @click="handleEnterpriseClick">
             <v-img rounded width="40" height="40" src="https://minio.citupro.com/dev/menduner/7.png" ></v-img>
             <span class="ml-3">广州辞图科技有限公司</span>
           </div>
@@ -95,7 +95,7 @@ const userStore = useUserStore()
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
-const handleLogoClick = () => { router.push({ path: '/enterprise/home'}) }
+const handleLogoClick = () => { router.push({ path: '/enterprise'}) }
 
 // const changeRole = () => {
 //   router.push({ path: '/' })
@@ -104,6 +104,9 @@ const handleLogoClick = () => { router.push({ path: '/enterprise/home'}) }
 const handleToPersonalCenter = () => {
   // router.push({ path: '/personalCenter' })
 }
+const handleEnterpriseClick = () => {
+  router.push({ path: '/enterprise/enterpriseCenter' })
+}
 
 // 退出登录
 const handleLogout = async () => {

src/layout/enterprise.vue

@@ -2,7 +2,7 @@
   <div class="parent d-flex flex-column">
     <Headers class="headers"></Headers>
     <div class="content d-flex">
-      <side class="content-sticky"></side>
+      <side class="content-sticky" v-if="whiteList.indexOf(router.currentRoute.value.path) === -1"></side>
       <div class="pa-3 content-box">
         <router-view></router-view>
       </div>
@@ -15,7 +15,12 @@
 import Headers from './company/navBar.vue'
 import Slider from './company/slider.vue'
 import side from './company/side.vue'
+import { useRouter } from 'vue-router'
 defineOptions({ name: 'enterprise-layout-index' })
+// 不展示侧边栏名单
+const whiteList = ['/enterprise/enterpriseCenter']
+const router = useRouter()
+console.log('router.currentRoute.value.path', router.currentRoute.value.path)
 </script>
 
 <style lang="scss" scoped>

src/router/modules/enterprise.js

@@ -125,6 +125,22 @@ const enterprise = [
         component: () => import('@/views/enterprise/systemManagement/informationSettings.vue')
       }
     ]
-  }
+  },
+  {
+    path: '/enterprise/enterpriseCenter',
+    component: Layout,
+    name: 'enterpriseCenter',
+    show: true,
+    meta: {
+      title: '企业中心'
+    },
+    children: [
+      {
+        path: '/enterprise/enterpriseCenter',
+        show: true,
+        component: () => import('@/views/enterprise/enterpriseCenter/index.vue')
+      }
+    ]
+  },
 ]
 export default enterprise

src/views/enterprise/components/inReview.vue

@@ -1,42 +1,43 @@
+<!-- 注册企业进度 -->
 <template>
   <div class="pt-5">
     <v-card class="default-width pa-5">
       <div style="width: 600px;margin: 80px auto;">
 
         <!-- 提交企业注册以后跳转显示页面 -->
-        <div v-if="!info || !(Object.keys(info).length)">
+        <div v-if="!applyInfo || !(Object.keys(applyInfo).length)">
           <span>提交成功，审核时间在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收</span>
         </div>
 
         <!-- 等待审核 -->
-        <div v-else-if="info.status === '0'">
+        <div v-else-if="applyInfo.status === '0'">
           <span>您的申请正在审核中，审核时间在1~3个工作日内，申请结果会以短信方式通知到您的手机上，请注意查收</span>
           <div class="mt-5">
-            <span>提交时间：{{ info.info.createTime }}</span>
+            <span>提交时间：{{ applyInfo.createTime }}</span>
           </div>
         </div>
 
         <!-- 审核不通过 -->
-        <div v-else-if="info.status === '2'">
+        <div v-else-if="applyInfo.status === '2'">
           <div class="mb-3" style="color: red;">审核不通过</div>
-          <div class="mb-3">原因：{{ info.reason }}</div>
-          <div v-if="info.remark">备注：{{ info.remark }}</div>
-          <!-- <div class="mt-5">
-            <span>审核时间：{{ updateTime }}</span>
-          </div> -->
+          <div class="mb-3">原因：{{ applyInfo.reason }}</div>
+          <div v-if="applyInfo.remark">备注：{{ applyInfo.remark }}</div>
           <div class="mt-5">
-            <span>提交时间：{{ info.info.createTime }}</span>
+            <span>审核时间：{{ applyInfo.updateTime }}</span>
+          </div>
+          <div class="mt-5">
+            <span>提交时间：{{ applyInfo.createTime }}</span>
           </div>
         </div>
 
         <!-- 审核通过（审核通过不会进入此页面） -->
-        <div v-else-if="info.status === '1'">
+        <div v-else-if="applyInfo.status === '1'">
           <span>审核通过</span>
         </div>
         
         <div class="text-center">
           <v-btn class="mt-16" color="warning" to="/">{{ $t('common.toHome') }}</v-btn>
-          <v-btn v-if="info.status === '2'" class="mt-16 ml-12" color="primary" to="/enterprise/register">{{ $t('common.resubmit') }}</v-btn>
+          <v-btn v-if="applyInfo.status === '2'" class="mt-16 ml-12" color="primary" to="/enterprise/register">{{ $t('common.resubmit') }}</v-btn>
         </div>
       </div>
     </v-card>
@@ -44,22 +45,25 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
 import { timesTampChange } from '@/utils/date'
 import { getUserRegisterEnterpriseApply } from '@/api/personal/user'
+import { ref } from 'vue';
 defineOptions({name: 'enterprise-enterpriseRegister-inReview'})
 
-const info = ref({})
+const applyInfo = ref({})
 
 // 查看用户是否有在申请中的数据
 const getApplyInfo = async () => {
   const data = await getUserRegisterEnterpriseApply() // 已经有数据说明已经申请过了
   localStorage.setItem('userApplyInfo', JSON.stringify(data))
-  info.value.info.createTime = ref(data?.createTime ? timesTampChange(data.createTime) : null) // 创建时间
-  // updateTime = ref(data?.createTime ? timesTampChange(data.updateTime) : null) // 更新时间
-  info.value.status = ref(data?.status) // 帐号状态（0正常 1停用 2 等待审核 3不通过） // 审核状态
-  info.value.reason = ref(data?.reason) // 审核原因
-  info.value.remark = ref(data?.remark) // 备注
+  const obj = {
+    createTime: timesTampChange(data.createTime), // 创建时间
+    updateTime: timesTampChange(data.updateTime), // 更新时间
+    status: data.status, // 审核状态（0审核中 1审核通过 2审核不通过）） // 审核状态
+    reason: data.reason, // 审核原因
+    remark: data.remark, // 备注
+  }
+  applyInfo.value = obj
 }
 getApplyInfo()
 

src/views/enterprise/enterpriseCenter/index.vue

@@ -0,0 +1,10 @@
+<!-- 企业中心 -->
+<template>
+  <div class="ma-10">企业中心</div>
+</template>
+
+<script setup>
+defineOptions({name: 'enterprise-enterpriseCenter'})
+</script>
+<style lang="scss" scoped>
+</style>

src/views/recruit/position/components/areaCascader/index.vue

@@ -71,7 +71,7 @@ getDict('areaTreeData', {}, 'areaTreeData').then(({ data }) => {
             const arr = idsStr.split('_')
             if (arr?.length) {
               arr.forEach(idItem => {
-                const dataItem = treeList.value[levelIndex].find(findItem => findItem.id === (idItem - 0))
+                const dataItem = treeList.value[levelIndex].find(findItem => (findItem.id - 0) === (idItem - 0))
                 if (dataItem) handleNext(dataItem, levelIndex, false, true)
               })
             }