feat: 合并解决冲突

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

@@ -0,0 +1,123 @@
+<template>
+  <div class="equipment-index">
+    <!-- 背景图片 -->
+    <div
+      class="absolute inset-0 bg-cover bg-center bg-no-repeat equipment-bg"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.EQUIPMENT.BG) }"
+    >
+      <div class="equipment-bar">
+        <img src="@/assets/images/equipment/侧边导航栏.png" alt="" :hidden="hiddenbar" />
+        <div class="equipment-item" :hidden="hiddenbar">
+          <span>
+            <img src="@/assets/images/equipment/选中按钮.png" alt="" />
+            <img src="@/assets/images/equipment/手机-亮.png" alt="" />
+          </span>
+        </div>
+        <!-- 设备准备按钮 -->
+        <div class="equipment-bt">
+          <img src="@/assets/images/equipment/按钮选中-设备准备.png" alt="" />
+        </div>
+        <div
+          :class="hiddenbar ? 'equipment-unfold1' : 'equipment-unfold2'"
+          @click="hiddenbarclick()"
+        >
+          <img src="@/assets/images/equipment/按钮-展开.png" alt="" />
+        </div>
+      </div>
+      <GuideSteps
+        @complete="handleComplete"
+        @skip="handleSkip"
+        :keyboard-navigation="true"
+        position-offset-y="85%"
+      >
+        <GuideStepsItem>
+          <img src="@/assets/images/equipment/设备准备引导1.png" alt="" />
+        </GuideStepsItem>
+      </GuideSteps>
+    </div>
+  </div>
+</template>
+<script lang="tsx" setup>
+import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
+import { GuideSteps, GuideStepsItem } from '@/components/Guide'
+
+import { ref } from 'vue'
+const hiddenbar = ref()
+const hiddenbarclick = () => {
+  hiddenbar.value = !hiddenbar.value
+}
+
+const handleComplete = () => {
+  console.log('引导完成')
+}
+
+const handleSkip = () => {
+  console.log('跳过引导')
+}
+</script>
+<style lang="less" scoped>
+.equipment-index {
+  // display: flex;
+  width: 100%;
+  height: 100%;
+}
+
+.equipment-bg {
+  display: flex;
+}
+
+.equipment-bar {
+  position: relative;
+
+  .equipment-bt {
+    position: absolute;
+    top: 0;
+    left: -135px;
+    width: 577px;
+
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .equipment-unfold1 {
+    position: absolute;
+    top: 45%;
+    right: -110px;
+    width: 150px;
+
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+      /* 确保图片按比例缩放 */
+    }
+  }
+
+  .equipment-unfold2 {
+    position: absolute;
+    top: 45%;
+    right: -69px;
+    width: 150px;
+
+    img {
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+      /* 确保图片按比例缩放 */
+    }
+  }
+
+  .equipment-item {
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding-top: 220px;
+
+    span {
+      display: flex;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1,124 @@
+<script lang="tsx" setup>
+import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
+import { ImgButton } from '@/components/Button'
+
+import { ref } from 'vue'
+import { ProgressBar } from '@/components'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+
+const currentStep = ref(1)
+
+const handleComplete = () => {
+  console.log('完成前置条件')
+  // 处理完成逻辑
+}
+
+const handleStepChange = (step: number) => {
+  console.log('步骤变化:', step)
+  // 处理步骤变化逻辑
+}
+
+const handleWorkClick = () => {
+  console.log('任务取景按钮点击')
+  // 处理任务取景按钮点击逻辑
+  router.push({ name: 'Work' })
+}
+const highlightShow = ref(true)
+</script>
+
+<template>
+  <div class="w-full h-full relative">
+    <!-- 背景图片-center -->
+    <div
+      class="absolute inset-0 bg-cover bg-center bg-no-repeat"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.BG_CENTER) }"
+    ></div>
+
+    <!-- 背景图片 -->
+    <div
+      class="absolute inset-0 bg-cover bg-center bg-no-repeat"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.BG) }"
+    ></div>
+
+    <!-- 标题 -->
+    <div class="absolute top-2 left-1/2 -translate-x-1/2">
+      <ImgButton :image="IMAGE_PATHS.VLOG.TITLE" />
+    </div>
+
+    <!-- 任务取景按钮 -->
+    <div
+      class="absolute left-24 top-24"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.TASK_CAMERA) }"
+    >
+      <ImgButton :image="IMAGE_PATHS.VLOG.TASK_BTN" @click="handleWorkClick" />
+    </div>
+    <!-- 中期拍摄底板 -->
+    <div v-if="highlightShow" class="absolute right-90 ml-[135px]" style="z-index: 998">
+      <ImgButton :image="IMAGE_PATHS.VLOG.Midterm" />
+    </div>
+    <!-- 进度百分比 -->
+    <div v-if="highlightShow" class="absolute left-1/2 top-[12%] -translate-x-1/2">
+      <div class="flex">
+        <ImgButton :image="IMAGE_PATHS.VLOG.Progress" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Four" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Zero" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Percentage" />
+      </div>
+    </div>
+    <!-- 中期准备按钮文字 -->
+    <div
+      v-if="highlightShow"
+      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.MidtermFraming" class="ml-[40px]" />
+      <ImgButton :image="IMAGE_PATHS.VLOG.MidtermShoot" class="ml-[20px]" />
+    </div>
+    <!-- 遮罩层 -->
+    <div class="Shadow" v-if="highlightShow">
+      <div>
+        <img src="" alt="" />
+      </div>
+      <img src="@/assets/images/midterm/引导遮罩.png" alt="" />
+    </div>
+    <!-- 叉 -->
+    <div
+      v-if="highlightShow"
+      class="absolute right-0 top-0"
+      style="z-index: 998; cursor: pointer"
+      @click="highlightShow = false"
+    >
+      <img src="@/assets/images/midterm/叉.png" alt="" />
+    </div>
+    <!-- 引导任务 -->
+    <!-- <ImgButton class="absolute right-24 bottom-24" :image="IMAGE_PATHS.VLOG.TASK_PERSON" /> -->
+
+    <div v-if="highlightShow" class="absolute bottom-0 w-full bright">
+      <ProgressBar
+        :current-step="currentStep"
+        @complete="handleComplete"
+        @step-change="handleStepChange"
+      />
+    </div>
+  </div>
+</template>
+<style lang="less" scopeds>
+.Shadow {
+  width: 100%;
+  height: 100%;
+
+  img {
+    width: 100%;
+    height: 100%;
+    z-index: 997 !important;
+    position: absolute;
+  }
+}
+
+.bright {
+  z-index: 999 !important;
+}
+</style>

src/views/prepare/index.vue

@@ -0,0 +1,126 @@
+<script lang="tsx" setup>
+import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
+import { ImgButton } from '@/components/Button'
+
+import { ref, computed } from 'vue'
+import { ProgressBar } from '@/components'
+import { useRouter } from 'vue-router'
+
+import { GuideSteps } from '@/components/Guide'
+type WorkTab = 'vlog' | 'case' | 'profession' | 'idea'
+const steps = [
+  {
+    id: 'step1',
+    content:
+      '引导词：前期准备要做好四件事，【资源筹备】【创意构想】【脚本撰写】【分镜制作】，画面中高亮的按钮是我们可以展开学习的内容。点击进入学习吧！'
+  },
+  { id: 'step2', content: '这是主要内容区域的边框' }
+]
+// const selected = ref<WorkTab>('vlog')
+const stepIndex = ref(0)
+const currentHighlight = computed(() =>
+  stepIndex.value === 0 ? '.img-switch-item--vlog' : '.work-border'
+)
+
+const router = useRouter()
+
+const currentStep = ref(0)
+
+const handleComplete = () => {
+  console.log('完成前置条件')
+  // 处理完成逻辑
+}
+
+const handleStepChange = (step: number) => {
+  console.log('步骤变化:', step)
+  // 处理步骤变化逻辑
+}
+
+const handleWorkClick = () => {
+  console.log('任务取景按钮点击')
+  // 处理任务取景按钮点击逻辑
+  router.push({ name: 'Work' })
+}
+interface SimpleStep {
+  id: string
+  content: string
+}
+const handleStepChangeGui = (_step: SimpleStep | null, index: number) => {
+  stepIndex.value = index
+}
+</script>
+
+<template>
+  <div class="w-full h-full relative">
+    <!-- 背景图片-center -->
+    <div
+      class="absolute inset-0 bg-cover bg-center bg-no-repeat"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.BG_CENTER) }"
+    ></div>
+
+    <!-- 背景图片 -->
+    <div
+      class="absolute inset-0 bg-cover bg-center bg-no-repeat"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.BG) }"
+    ></div>
+
+    <!-- 标题 -->
+    <div class="absolute top-2 left-1/2 -translate-x-1/2">
+      <ImgButton :image="IMAGE_PATHS.VLOG.TITLE" />
+    </div>
+
+    <!-- 任务取景按钮 -->
+    <div
+      class="absolute left-24 top-24"
+      :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.VLOG.TASK_CAMERA) }"
+    >
+      <ImgButton :image="IMAGE_PATHS.VLOG.TASK_BTN" @click="handleWorkClick" />
+    </div>
+    <!-- 前期准备底板 -->
+    <div class="absolute right-90 ml-[135px]">
+      <ImgButton :image="IMAGE_PATHS.VLOG.PREPARE" />
+    </div>
+    <!-- 脚本撰写按钮 -->
+    <div class="absolute left-[13%] top-1/3">
+      <ImgButton :image="IMAGE_PATHS.VLOG.Scripting" />
+    </div>
+    <!-- 选中箭头 -->
+    <div class="absolute left-[13%] top-[37%] -translate-x-1/2">
+      <ImgButton :image="IMAGE_PATHS.VLOG.SelectArrow" />
+    </div>
+    <!-- 进度百分比 -->
+    <div class="absolute left-1/2 top-[12%] -translate-x-1/2">
+      <div class="flex">
+        <ImgButton :image="IMAGE_PATHS.VLOG.Progress" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Four" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Zero" />
+        <ImgButton :image="IMAGE_PATHS.VLOG.Percentage" />
+      </div>
+    </div>
+    <!-- 引导任务 -->
+    <!-- <ImgButton class="absolute right-24 bottom-24" :image="IMAGE_PATHS.VLOG.TASK_PERSON" /> -->
+
+    <div class="absolute bottom-0 w-full">
+      <ProgressBar
+        :current-step="currentStep"
+        @complete="handleComplete"
+        @step-change="handleStepChange"
+      />
+    </div>
+    <GuideSteps
+      :steps="steps"
+      :highlight-selector="currentHighlight"
+      :highlight-padding="12"
+      :highlight-radius="20"
+      @step-change="handleStepChangeGui"
+    />
+  </div>
+</template>
+<style>
+.guide-ui {
+  top: 80% !important;
+}
+.dragon-character {
+  top: 80% !important;
+}
+</style>