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

src/layout/company/navBar.vue

@@ -15,10 +15,10 @@
         <div class="d-flex user-nav align-center">
           <div class="d-flex align-center cursor-pointer">
             <v-img @click="enterpriseClick(2)" rounded width="40" height="40" :src="baseInfo?.logoUrl || 'https://minio.citupro.com/dev/menduner/company-avatar.png'" ></v-img>
-            <span @click="enterpriseClick(1)" class="ml-3">{{ baseInfo?.enterpriseAnotherName || baseInfo?.enterpriseName || '--' }}</span>
+            <span @click="enterpriseClick(1)" class="ml-3 commonHover">{{ baseInfo?.enterpriseAnotherName || baseInfo?.enterpriseName || '--' }}</span>
           </div>
-          <div class="ml-3 cursor-pointer border-left border-right px-3 active" @click="handleLogout">我要求职</div>
-          <div class="cursor-pointer border-right px-3 active" @click="router.push('/recruit/enterprise/hirePosition')">全员猎聘</div>
+          <div class="ml-3 cursor-pointer border-left border-right px-3 commonHover" @click="handleLogout">我要求职</div>
+          <div class="cursor-pointer border-right px-3 commonHover" @click="router.push('/recruit/enterprise/hirePosition')">全员猎聘</div>
           <div class="d-flex align-center px-3 border-right">
             <div>{{ $t('enterprise.account.remainingPoints') }}：{{ enterpriseUserAccount?.balance || 0 }}点</div>
           </div>
@@ -32,7 +32,7 @@
                   <v-avatar>
                     <v-img alt="" :src="getUserAvatar(baseInfo?.avatar, baseInfo?.sex)"></v-img>
                   </v-avatar>
-                  <div class="ml-2">{{ baseInfo?.name ?? $t('sys.tourist') }}</div>
+                  <div class="ml-2 commonHover">{{ baseInfo?.name ?? baseInfo?.phone }}</div>
                 </div>
               </template>
 
@@ -73,7 +73,7 @@
           </v-menu> -->
 
           <!-- 消息通知 -->
-          <MessageNotification path="/recruit/enterprise/chatTools"></MessageNotification>
+          <MessageNotification class="commonHover2" path="/recruit/enterprise/chatTools"></MessageNotification>
         </div>
       </div>
     </v-toolbar>
@@ -214,7 +214,4 @@ getEnterpriseListData()
 .border-right {
   border-right: 1px solid #fff;
 }
-.active:hover {
-  text-decoration: underline;
-}
 </style>

src/layout/personal/navBar.vue

@@ -7,7 +7,7 @@
     >
       <div class="innerBox d-flex justify-space-between">
         <div>
-          <div class="nav-logo mr-5 mt-1">
+          <div class="nav-logo mr-5 mt-1 cursor-pointer" @click="router.push('/')">
             <v-img src="../../assets/logo.png"  aspect-ratio="16/9" cover :width="90" style="height: 40px"></v-img>
           </div>
           <!-- <div class="nav-city">
@@ -21,10 +21,10 @@
           <div class="menuList">
             <div v-for="val in navList" :key="val.name" class="mr-3">
               <template v-if="val.children">
-                <defineListPage v-bind="$attrs" :title="val.title" :list="val.children" @emitClick="handleClick"></defineListPage>
+                <defineListPage v-bind="$attrs" :title="val.title" :list="val.children" @emitClick="handleClick" :closeOnContentClick="true"></defineListPage>
               </template>
               <template v-else>
-                <span class="cursor-pointer menuList-first-title" :class="{'active-route': routeActive === paths.indexOf(val.path)}" @click="handleClick(val)">{{ val.title }}</span>
+                <span class="cursor-pointer menuList-first-title" :class="{'active-route': routeActive === paths.indexOf(val.path)}" @click="handleClick(val, true)">{{ val.title }}</span>
               </template>
             </div>
           </div>
@@ -176,9 +176,10 @@ const navList = [
   { title: '了解门墩儿' },
 ]
 
-const handleClick = (e) => {
+const handleClick = (e, status) => {
   if (!e.path) return
-  window.open(e.path)
+  if (status) window.open(e.path)
+  else router.push(e.path)
 }
 
 const routeActive = computed(() => {

src/views/entrances/navBar/components/defineListPage.vue

@@ -1,5 +1,5 @@
 <template>
-  <m-menu :btnTitle="title">
+  <m-menu :btnTitle="title" :closeOnContentClick="closeOnContentClick">
     <v-card elevation="3" style="padding: 40px 60px; width: 100%; overflow: auto;">
       <div v-if="list?.length" class="d-flex">
         <div v-for="(item, i) in list" :key="'product'+i" :style="{'margin-left': i ? ml : 'auto'}">
@@ -47,6 +47,10 @@ defineProps({
   ml: {
     type: String,
     default: '150px'
+  },
+  closeOnContentClick: {
+    type: Boolean,
+    default: false
   }
 })
 </script>