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

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" v-if="whiteList.indexOf(router.currentRoute.value.path) === -1"></side>
+      <side class="content-sticky" v-if="!router.currentRoute.value?.meta?.hideSide"></side>
       <div class="pa-3 content-box">
         <router-view></router-view>
       </div>
@@ -17,8 +17,6 @@ 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()
 </script>
 

src/router/modules/enterprise.js

@@ -28,7 +28,8 @@ const enterprise = [
         component: () => import('@/views/enterprise/talentPool/components/details'),
         name: 'talentPoolDetails',
         meta: {
-          title: '人才详情'
+          title: '人才详情',
+          hideSide: true
         }
       }
     ]
@@ -187,7 +188,11 @@ const enterprise = [
       {
         path: '/enterprise/enterpriseCenter',
         show: true,
-        component: () => import('@/views/enterprise/enterpriseCenter/index.vue')
+        component: () => import('@/views/enterprise/enterpriseCenter/index.vue'),
+        meta: {
+          title: '企业中心',
+          hideSide: true
+        }
       }
     ]
   }

src/views/enterprise/talentPool/components/details.vue

@@ -1,7 +1,7 @@
 <!-- 人才库 - 人才详情 -->
 <template>
-  <div class="white-bgc pt-2 pb-16 d-flex justify-center" style="width: 100%;">
-    <div style="width: 940px;overflow-y: auto;background: none;" class=" pa-3 mr-3">
+  <div class="d-flex justify-center">
+    <div style="width: 940px;overflow-y: auto;background: #fff;" class="px-8 py-3 my-n3 mr-3">
       <!-- 基本信息 -->
       <baseInfo class="mt-5"></baseInfo>
       <!-- 个人优势 -->
@@ -89,6 +89,6 @@ const operateItems = [
   position: sticky;
   top: 60px;
   // background-color: var(--default-bgc);
-  background-color: #f7f8fa;
+  // background-color: #f7f8fa;
 }
 </style>

src/views/enterprise/talentPool/components/details/baseInfo.vue

@@ -17,7 +17,7 @@
     <div style="flex: 1;">
       <span style="font-size: 20px; font-weight: 600;color: #666;">{{ info?.name }}</span>
       <div class="mt-3 d-flex">
-        <div class="listBox" :style="{ height: isExpand ? 'auto' : '68px' }">
+        <div class="listBox" style="height: 68px">
           <div>
             <span class="mdi mdi-map-marker-outline"></span>
             <span>{{ info?.areaName || '暂无' }}</span>