feat: 解决合并冲突

src/views/midterm-shooting/midterm/index.vue

@@ -25,6 +25,11 @@ const handleWorkClick = () => {
   // 处理任务取景按钮点击逻辑
   router.push({ name: 'Work' })
 }
+
+const handleClick = () => {
+  // 处理任务取景按钮点击逻辑
+  router.push({ name: 'equipment' })
+}
 const highlightShow = ref(true)
 </script>
 
@@ -59,7 +64,10 @@ const highlightShow = ref(true)
       <ImgButton :image="IMAGE_PATHS.VLOG.Midterm" />
     </div>
     <!-- 进度百分比 -->
-    <div v-if="highlightShow" class="absolute left-1/2 top-[12%] -translate-x-1/2">
+    <div
+      v-if="highlightShow"
+      class="absolute left-1/2 top-[12%] -translate-x-1/2 pointer-events-none"
+    >
       <div class="flex">
         <ImgButton :image="IMAGE_PATHS.VLOG.Progress" />
         <ImgButton :image="IMAGE_PATHS.VLOG.Four" />
@@ -73,7 +81,11 @@ const highlightShow = ref(true)
       class="absolute left-[21%] top-[9%] -translate-x-1/2"
       style="z-index: 998"
     >
-      <ImgButton :image="IMAGE_PATHS.VLOG.MidtermEquipment" class="ml-[60px]" />
+      <ImgButton
+        :image="IMAGE_PATHS.VLOG.MidtermEquipment"
+        @click="handleClick"
+        class="ml-[60px]"
+      />
       <ImgButton :image="IMAGE_PATHS.VLOG.MidtermFraming" class="ml-[40px]" />
       <ImgButton :image="IMAGE_PATHS.VLOG.MidtermShoot" class="ml-[20px]" />
     </div>

src/views/prepare/index.vue

@@ -7,7 +7,6 @@ import { ProgressBar } from '@/components'
 import { useRouter } from 'vue-router'
 
 import { GuideSteps } from '@/components/Guide'
-type WorkTab = 'vlog' | 'case' | 'profession' | 'idea'
 const steps = [
   {
     id: 'step1',

src/views/vlog/video/index.vue

@@ -78,9 +78,9 @@ const handleComplete = () => {
     })
   } else {
     router.push({
-      name: 'Vlog',
+      name: 'midterm',
       query: {
-        key: 'video'
+        key: 'midterm'
       }
     })
   }