冲突合并

src/components/Position/longStrip.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="position-item mb-3 job-closed" style="position: relative;" :class="val.active ? 'elevation-8' : 'elevation-3'"
+    <div class="position-item mb-3 job-closed" style="position: relative;" :class="val.active ? 'elevation-8 hoverShadowSolid' : 'elevation-3'"
       v-for="(val, i) in props.items" :key="i" @mouseenter="val.active = true" @mouseleave="val.active = false"
     >
       <div class="info-header">

src/components/PositionLongStrip/item.vue

@@ -4,7 +4,7 @@
     <div class="position-and-company">
       <!-- 职位 -->
       <div
-        class="position cursor-pointer rounded-lg ml-3" :class="item.positionActive ? 'elevation-5' : ''"
+        class="position cursor-pointer rounded-lg ml-3" :class="item.positionActive ? 'elevation-5 hoverShadowSolid' : ''"
         @mouseenter="item.positionActive = true" @mouseleave="item.positionActive = false" @click.stop="handlePosition(item)"
       >
         <div class="d-flex">
@@ -41,7 +41,7 @@
       </div>
       <!-- 公司 -->
       <div
-        class="company rounded-lg pa-4 cursor-pointer mr-3" :class="item.companyActive ? 'elevation-5' : ''"
+        class="company rounded-lg pa-4 cursor-pointer mr-3" :class="item.companyActive ? 'elevation-5 hoverShadowSolid' : ''"
         @click.stop="jumpToEnterpriseDetail(item.enterprise.id, true)" @mouseenter="item.companyActive = true" @mouseleave="item.companyActive = false">
         <div class="float-left">
           <v-img class="entLogoImg" :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;"/>

src/styles/index.css

@@ -362,6 +362,15 @@ body {
   clip-path: polygon(20% 0, 100% 0, 100% 100%, 0 100%);
 }
 
+.hoverShadow {
+  box-shadow: 5px 9px 12px 1px rgba(0, 183, 96, 0.17) !important;
+}
+
+.hoverShadowSolid {
+  box-shadow: 5px 9px 12px 1px rgba(0, 183, 96, 0.17) !important;
+  border: 1px solid #00B760 !important;
+}
+
 .btnColor {
   color: #fff;
   opacity: .7;

src/styles/index.scss

@@ -313,6 +313,13 @@
     }
   }
 }
+.hoverShadow {
+  box-shadow: 5px 9px 12px 1px rgba(0, 183, 96, 0.17) !important;
+}
+.hoverShadowSolid {
+  box-shadow: 5px 9px 12px 1px rgba(0, 183, 96, 0.17) !important;
+  border: 1px solid #00B760 !important;
+}
 
 .btnColor {
   color: #fff;

src/views/recruit/personal/home/components/homeJobTypeCard/index.vue

@@ -1,6 +1,6 @@
 <!-- 主页职业类型面板 -->
 <template>
-  <v-card class="hasPageCard d-flex" elevation="0">
+  <v-card class="hasPageCard d-flex" elevation="3">
     <div class="leftBox">
       <div class="leftCard d-flex flex-column flex-wrap pt-3">
         <div
@@ -199,7 +199,7 @@ const handleClick = (item) => {
   //   border-radius: 12px;
   // }
   .leftIndexAct {
-    color: #fff;
+    color: #fff !important;
     background-color: var(--v-primary-base);
   }
   justify-content: center; // 后面的flex会继承
@@ -216,6 +216,9 @@ const handleClick = (item) => {
       margin: 0 20px;
       // padding: 0 16px;
       border-radius: none;
+      &:hover {
+        color: var(--v-primary-base);
+      }
       .title { font-size: 14px; }
       .mdi-menu-right { font-size: 20px; }
     }

src/views/recruit/personal/recommend/components/positionList.vue

@@ -1,9 +1,10 @@
 <template>
-  <div class="d-flex">
+  <div class="d-flex pl-3">
     <div class="position-box">
-      <div class="sub-li"
+      <div
         v-for="(item, index) in list" :key="index"
-        :class="[{'chosen': chosenIndex === index}, item.active ? 'elevation-8' : 'elevation-3']"
+        class="sub-li pl-3"
+        :class="[{'hoverShadowSolid': chosenIndex === index}, item.active ? 'elevation-8 hoverShadow' : 'elevation-0']"
         :style="`margin-top: ${index ? '12px' : '0'}`"
         @mouseenter="item.active = true" @mouseleave="item.active = false"
         @click="handleClick(item, index)"
@@ -95,7 +96,6 @@ const handleClick = (item, index) => {
   width: 100%;
   height: 100%;
 }
-.chosen { border: 1px solid var(--v-primary-base) !important; }
 .sub-li {
   position: relative;
   width: 384px;
@@ -107,7 +107,7 @@ const handleClick = (item, index) => {
   overflow: hidden;
   cursor: pointer;
   background-color: #fff;
-  border: 1px solid #fff;
+  border: 1px solid #ddd;
 }
 .job-info {
   position: relative;