Merge branch 'main' of https://gitee.com/zzyyymm/super_video

src/components/Sidebar/Sidebar.vue

@@ -56,7 +56,7 @@ const isCollapsed = ref(false)
 const activeIndex = ref(props.defaultActive)
 
 // 是否折叠
-const collapsed = ref(false)
+// const collapsed = ref(false)
 
 // 选择菜单项
 const selectItem = (index: number) => {
@@ -65,9 +65,9 @@ const selectItem = (index: number) => {
 }
 
 // 切换折叠状态
-const toggleCollapse = () => {
-  collapsed.value = !collapsed.value
-}
+// const toggleCollapse = () => {
+//   collapsed.value = !collapsed.value
+// }
 </script>
 
 <style lang="less">

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

@@ -90,7 +90,7 @@
   </div>
 </template>
 <script lang="tsx" setup>
-import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
+import { getBackgroundImage, getStaticImage, IMAGE_PATHS } from '@/utils'
 import { GuideSteps, GuideStepsItem } from '@/components/Guide'
 import { ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
@@ -110,18 +110,18 @@ const hiddenbar = ref(false)
 const currentIndex = ref(0) // 当前显示的图片索引
 
 const phoneList = ref([
-  { phoneImg: '/src/assets/images/equipment/设备-手机1.png' },
-  { phoneImg: '/src/assets/images/equipment/设备-手机2.png' }
+  { phoneImg: getStaticImage('equipment/设备-手机1.png') },
+  { phoneImg: getStaticImage('equipment/设备-手机2.png') }
 ])
 
 const platetitleList = ref([
-  { title: '/src/assets/images/equipment/标题-苹果.png' },
-  { title: '/src/assets/images/equipment/标题-安卓小米.png' }
+  { title: getStaticImage('equipment/标题-苹果.png') },
+  { title: getStaticImage('equipment/标题-安卓小米.png') }
 ])
 
 const platetextList = ref([
-  { text: '/src/assets/images/equipment/内容-苹果.png' },
-  { text: '/src/assets/images/equipment/内容-安卓小米.png' }
+  { text: getStaticImage('equipment/内容-苹果.png') },
+  { text: getStaticImage('equipment/内容-安卓小米.png') }
 ])
 const hiddenbarclick = () => {
   hiddenbar.value = !hiddenbar.value

src/views/midterm-shooting/shooting/filmingLocation-a/a-3.vue

@@ -2,10 +2,10 @@
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
-const handleClicka2 = () => {
-  // 跳转设备准备
-  router.push({ name: 'a-2' })
-}
+// const handleClicka2 = () => {
+//   // 跳转设备准备
+//   router.push({ name: 'a-2' })
+// }
 const back = () => {
   // 跳转设备准备
   router.back()

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

@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
-import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()

src/views/midterm-shooting/shooting/filmingLocation-b/b-3.vue

@@ -2,10 +2,10 @@
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
-const handleClickb2 = () => {
-  // 跳转设备准备
-  router.push({ name: 'b-2' })
-}
+// const handleClickb2 = () => {
+//   // 跳转设备准备
+//   router.push({ name: 'b-2' })
+// }
 const back = () => {
   // 跳转设备准备
   router.back()

src/views/preparedetail/index.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script setup lang="tsx">
-import { ref, reactive, onMounted } from 'vue'
+import { ref } from 'vue'
 import Sidebar from '@/components/Sidebar/Sidebar.vue'
 import { getBackgroundImage, IMAGE_PATHS } from '@/utils'
 import equipmentPhone from '@/assets/images/equipment/手机-亮.png'

src/views/skill/index.vue

@@ -13,15 +13,15 @@ const sideStatus = ref(true)
 
 const status = ref(false)
 
-const selectedButton = ref('拍摄基础')
-//按钮 {key: '拍摄基础', value: '拍摄基础'}
-const buttons = ref([
-  { key: '拍摄基础', value: '拍摄基础' },
-  { key: '内容策划', value: '内容策划' },
-  { key: '拍摄执行', value: '拍摄执行' },
-  { key: '后期制作', value: '后期制作' },
-  { key: '版权伦理意识', value: '版权伦理意识' }
-])
+// const selectedButton = ref('拍摄基础')
+// //按钮 {key: '拍摄基础', value: '拍摄基础'}
+// const buttons = ref([
+//   { key: '拍摄基础', value: '拍摄基础' },
+//   { key: '内容策划', value: '内容策划' },
+//   { key: '拍摄执行', value: '拍摄执行' },
+//   { key: '后期制作', value: '后期制作' },
+//   { key: '版权伦理意识', value: '版权伦理意识' }
+// ])
 
 // 预留：按钮选中状态（如需启用再恢复逻辑）
 

src/views/vlog/work/index.vue

@@ -1,6 +1,6 @@
 <script lang="tsx" name="Work" setup>
 defineOptions({ name: 'Work' })
-import { ref, computed, onMounted, onActivated } from 'vue'
+import { ref, computed, onActivated } from 'vue'
 import { getBackgroundImage, IMAGE_PATHS, getStaticImage } from '@/utils'
 import { ImgButton } from '@/components/Button'
 import WorkSideSwitcher from './components/WorkSideSwitcher.vue'