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

src/layout/index.vue

@@ -3,6 +3,12 @@
     <Headers class="headers"></Headers>
     <div class="content">
       <router-view></router-view>
+      <!-- <router-view v-slot="{ Component }">
+        <keep-alive>
+          <component :is="Component" :key="router.currentRoute.value.path" v-if="router.currentRoute.value.meta?.keepAlive"/>
+        </keep-alive>
+        <component :is="Component" :key="router.currentRoute.value.path" v-if="!router.currentRoute.value.meta?.keepAlive"/>
+      </router-view>  -->
     </div>
     <Footers v-if="footerWhiteList.indexOf(router.currentRoute.value.path) === -1" class="mt-10"></Footers>
     <Slider v-if="whiteList.indexOf(router.currentRoute.value.path) === -1" class="slider"></Slider>

src/router/index.js

@@ -5,7 +5,14 @@ const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
   routes: remainingRouter,
-  scrollBehavior: () => ({ left: 0, top: 0 })
+  // scrollBehavior: () => ({ left: 0, top: 0 })
+  scrollBehavior: ((to, from, savePosition) => {
+    if (savePosition) {
+      return savePosition
+    } else {
+      return { left: 0, top: 0 }
+    }
+  })
 })
 
 // export const resetRouter = () => {

src/views/headhunting/drill/consultant.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="color: #4c4c4e;">
     <div class="pt-5">
-      <v-breadcrumbs :items="paths" class="pa-0 ma-0"></v-breadcrumbs>
+      <v-btn size="large" color="primary" variant="text" prepend-icon="mdi-chevron-triple-left" @click="router.go(-1)">返回上一页</v-btn>
     </div>
     <div class="d-flex mt-10 justify-space-between">
       <div>
@@ -29,6 +29,9 @@ defineOptions({ name: 'headhunting-drill-consultant'})
 import { ref } from 'vue'
 import { consultantData } from '@/utils/headhuntingData'
 import ContactPage from '../components/contact.vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
 
 const props = defineProps({
   id: {
@@ -38,12 +41,6 @@ const props = defineProps({
 })
 
 const data = ref(consultantData.find(e => e.id === props.id))
-
-const paths = [
-  { title: '主页', disabled: false, href: '/headhunting' },
-  { title: '我们的顾问', disabled: true, href: '' },
-  { title: data.value.title, disabled: true, href: '' }
-]
 </script>
 
 <style scoped lang="scss">

src/views/headhunting/drill/service.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="color: #4c4c4e; height: calc(100vh - 151px);">
     <div class="pt-5">
-      <v-breadcrumbs :items="paths" class="pa-0 ma-0"></v-breadcrumbs>
+      <v-btn size="large" color="primary" variant="text" prepend-icon="mdi-chevron-triple-left" @click="router.go(-1)">返回上一页</v-btn>
     </div>
     <h1 class="my-5">{{ data.title }}</h1>
     <p class="font-weight-bold">{{ data.startDesc }}</p>
@@ -17,7 +17,9 @@
 defineOptions({ name: 'headhunting-drill-service' })
 import { ref } from 'vue'
 import { serviceData } from '@/utils/headhuntingData'
+import { useRouter } from 'vue-router'
 
+const router = useRouter()
 const props = defineProps({
   id: {
     type: String,
@@ -30,12 +32,6 @@ const props = defineProps({
 })
 
 const data = ref(serviceData.find(e => e.id === props.id))
-
-const paths = [
-  { title: '主页', disabled: false, href: '/headhunting' },
-  { title: '我们的服务', disabled: false, href: '/headhunting/service' },
-  { title: data.value.title, disabled: true, href: '' }
-]
 </script>
 
 <style scoped lang="scss">

src/views/headhunting/index.vue

@@ -7,9 +7,9 @@
 
 <script setup>
 defineOptions({ name: 'headhuntingIndex' })
+import { useRouter } from 'vue-router'
 import navBar from './components/nav.vue'
 import Content from './components/content.vue'
-import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const handleClickNav = (path) => {