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

src/components/Position/item.vue

@@ -4,7 +4,6 @@
       <div
         class="sub-li"
         v-for="(item, index) in props.items" :key="index"
-        :class="{'elevation-6': item.active}"
         :style="{'height': tab === 3 && item.hire ? '180px' : '149px'}"
         @mouseenter="item.active = true" @mouseleave="item.active = false"
         @click.stop="handlePosition(item)"
@@ -121,9 +120,14 @@ const handlePosition = (item) => {
   cursor: pointer;
   transition: all .2s linear;
   background-color: #fff;
+  border: 1px solid #fff;
   &:nth-child(3n) {
     margin-right: 0;
   }
+  &:hover {
+    box-shadow: 5px 9px 12px 1px rgba(0, 183, 96, 0.17);
+    border-color: #00B760;
+  }
 }
 .job-info {
   position: relative;

src/layout/company/navBar.vue

@@ -224,4 +224,7 @@ userStore.$subscribe((mutation, state) => {
 :deep(.v-toolbar__content) {
   height: 50px !important;
 }
+:deep(.v-chip.v-chip--size-small) {
+  height: 30px !important;
+}
 </style>

src/layout/message.vue

@@ -6,7 +6,7 @@
       :content="IM.unreadCount > 99 ? '99+' : IM.unreadCount"
       :model-value="IM.unreadCount > 0"
       offset-y="1"
-      offset-x="4"
+      offset-x="10"
     >
       <div class="customIcon" :class="{'noUnReadWidth': !IM.unreadCount || IM.unreadCount <= 0}" >
         <v-icon color="primary" size="16">mdi-bell</v-icon>
@@ -38,7 +38,7 @@ useIM()
   display: flex;
   align-items: center;
   justify-content: center;
-  height: 26px;
+  height: 30px;
   line-height: 23px;
   color: #00B760;
   padding: 0 10px;
@@ -47,17 +47,18 @@ useIM()
   font-weight: bold;
   font-size: 12px;
   cursor: pointer;
+  width: 50px;
   &:hover {
     background-color: #d7f3e7;
   }
 }
 .noUnReadWidth {
-  width: 26px;
-}
-:deep(.v-badge__badge) {
-  width: 25px;
-  height: 17px;
-  min-width: 25px;
-  font-size: 10px;
+  width: 30px;
 }
+// :deep(.v-badge__badge) {
+//   width: 25px;
+//   height: 17px;
+//   min-width: 25px;
+//   font-size: 10px;
+// }
 </style>

src/layout/personal/navBar.vue

@@ -107,7 +107,7 @@
           <div class="d-flex align-center ml-4" v-if="showBall">
             <message-notification v-if="showBall" :path="paths[3]"></message-notification>
           </div>
-          <div v-if="isLogin" class="d-flex align-center ml-6 cursor-pointer">
+          <div v-if="isLogin" class="d-flex align-center ml-4 cursor-pointer">
             <v-chip v-if="showTeacherLogin" label size="small" color="primary" variant="flat" @click="handleSwitchTeacher">切换为老师</v-chip>
             <v-chip v-else label color="primary" size="small" variant="flat" @click="handleSwitchEnterprise">我要招聘</v-chip>
           </div>

src/styles/personal/navBar.css

@@ -84,3 +84,7 @@
 :deep(.v-toolbar__content) {
   height: 50px !important;
 }
+
+:deep(.v-chip.v-chip--size-small) {
+  height: 30px !important;
+}

src/styles/personal/navBar.min.css

@@ -1 +1 @@
-@media (max-width: 1425px){.menuList{font-size:13px}.menuList>div{width:85px !important}}@media (max-width: 1480px){.menuList{margin-left:120px}}.vipBox .avatar{border:1px solid #b29701}.vipBox .avatar:hover{border:2px solid var(--v-primary-base)}.vipBox .userName{font-family:'MiSans-Bold';background:-webkit-linear-gradient(45deg, #333, #b29701);background:linear-gradient(45deg, #333, #b29701);-webkit-background-clip:text;background-clip:text;-webkit-text-fill-color:transparent}.banner{width:100%;height:50px;z-index:var(--zIndex-nav) !important;color:#333;background-color:#fff;border-bottom:1px solid #e8e6e6;padding-left:0px;font-size:15px}.innerBox{position:relative;width:100vw;min-width:1180px;margin:0 auto;align-items:center;height:50px;line-height:50px}.nav-logo{position:absolute;left:20px;margin-bottom:1px}.active-route{color:#00B760;font-weight:700;border-bottom:4px solid #00B760;background-color:#e5f8ef;height:50px}.menuList{display:flex;align-items:center;height:50px}.menuList div{width:110px;text-align:center}.menuList-first-title:hover{color:#00B760;font-weight:700}:deep(.v-toolbar__content){height:50px !important}
+@media (max-width: 1425px){.menuList{font-size:13px}.menuList>div{width:85px !important}}@media (max-width: 1480px){.menuList{margin-left:120px}}.vipBox .avatar{border:1px solid #b29701}.vipBox .avatar:hover{border:2px solid var(--v-primary-base)}.vipBox .userName{font-family:'MiSans-Bold';background:-webkit-linear-gradient(45deg, #333, #b29701);background:linear-gradient(45deg, #333, #b29701);-webkit-background-clip:text;background-clip:text;-webkit-text-fill-color:transparent}.banner{width:100%;height:50px;z-index:var(--zIndex-nav) !important;color:#333;background-color:#fff;border-bottom:1px solid #e8e6e6;padding-left:0px;font-size:15px}.innerBox{position:relative;width:100vw;min-width:1180px;margin:0 auto;align-items:center;height:50px;line-height:50px}.nav-logo{position:absolute;left:20px;margin-bottom:1px}.active-route{color:#00B760;font-weight:700;border-bottom:4px solid #00B760;background-color:#e5f8ef;height:50px}.menuList{display:flex;align-items:center;height:50px}.menuList div{width:110px;text-align:center}.menuList-first-title:hover{color:#00B760;font-weight:700}:deep(.v-toolbar__content){height:50px !important}:deep(.v-chip.v-chip--size-small){height:30px !important}

src/styles/personal/navBar.scss

@@ -78,4 +78,7 @@
 }
 :deep(.v-toolbar__content) {
   height: 50px !important;
+}
+:deep(.v-chip.v-chip--size-small) {
+  height: 30px !important;
 }