diff --git a/src/assets/images/components/返回.png b/src/assets/images/components/back.png similarity index 100% rename from src/assets/images/components/返回.png rename to src/assets/images/components/back.png diff --git a/src/assets/images/components/box.png b/src/assets/images/components/box.png index 349c999..d9046b5 100644 Binary files a/src/assets/images/components/box.png and b/src/assets/images/components/box.png differ diff --git a/src/assets/images/components/box2.png b/src/assets/images/components/box2.png new file mode 100644 index 0000000..349c999 Binary files /dev/null and b/src/assets/images/components/box2.png differ diff --git a/src/assets/images/components/叉.png b/src/assets/images/components/close.png similarity index 100% rename from src/assets/images/components/叉.png rename to src/assets/images/components/close.png diff --git a/src/assets/images/home/新手导航.png b/src/assets/images/home/新手导航.png new file mode 100644 index 0000000..e2e861d Binary files /dev/null and b/src/assets/images/home/新手导航.png differ diff --git a/src/assets/images/vlog/任务取景框/vlog初识框.png b/src/assets/images/work/vlog初识框.png similarity index 100% rename from src/assets/images/vlog/任务取景框/vlog初识框.png rename to src/assets/images/work/vlog初识框.png diff --git a/src/assets/images/work/vlog背景全屏待定.png b/src/assets/images/work/vlog背景全屏待定.png new file mode 100644 index 0000000..f83d4d0 Binary files /dev/null and b/src/assets/images/work/vlog背景全屏待定.png differ diff --git a/src/assets/images/work/思路提点全屏.png b/src/assets/images/work/思路提点全屏.png new file mode 100644 index 0000000..55639c5 Binary files /dev/null and b/src/assets/images/work/思路提点全屏.png differ diff --git a/src/assets/images/vlog/任务取景框/思路提点小屏.png b/src/assets/images/work/思路提点小屏.png similarity index 100% rename from src/assets/images/vlog/任务取景框/思路提点小屏.png rename to src/assets/images/work/思路提点小屏.png diff --git a/src/assets/images/vlog/任务取景框/案例背景待定.png b/src/assets/images/work/案例背景待定.png similarity index 100% rename from src/assets/images/vlog/任务取景框/案例背景待定.png rename to src/assets/images/work/案例背景待定.png diff --git a/src/assets/video/gt.mp4 b/src/assets/video/gt.mp4 new file mode 100644 index 0000000..a4a55ef Binary files /dev/null and b/src/assets/video/gt.mp4 differ diff --git a/src/assets/video/xyz.mp4 b/src/assets/video/xyz.mp4 new file mode 100644 index 0000000..33334ea Binary files /dev/null and b/src/assets/video/xyz.mp4 differ diff --git a/src/components/Guide/GuideDragon.vue b/src/components/Guide/GuideDragon.vue index ef36154..77dc122 100644 --- a/src/components/Guide/GuideDragon.vue +++ b/src/components/Guide/GuideDragon.vue @@ -6,9 +6,12 @@ :style="{ backgroundImage: getBackgroundImage(IMAGE_PATHS.GUIDE_DRAGON_BG) }"> --> -
+
-
+
-
+
导学小龙 @@ -60,6 +63,7 @@ diff --git a/src/components/Guide/GuideSteps.vue b/src/components/Guide/GuideSteps.vue index 0163c50..8b77e43 100644 --- a/src/components/Guide/GuideSteps.vue +++ b/src/components/Guide/GuideSteps.vue @@ -12,6 +12,7 @@ :show-skip="currentStep < totalSteps" :current-step="currentStep" :total-steps="totalSteps" + :position-offset-y="props.positionOffsetY" @next="handleNext" @skip="handleSkip" @complete="handleComplete" @@ -27,8 +28,16 @@ :total-steps="totalSteps" />
- -
+ + + {{ currentStepContent }} +
@@ -40,6 +49,7 @@ import { ref, computed, useSlots, onMounted, onUnmounted, reactive } from 'vue' import SpotlightOverlay from './SpotlightOverlay.vue' import GuideDragon from './GuideDragon.vue' +import GuideStepsItem from './GuideStepsItem.vue' interface GuideStep { id: string @@ -63,6 +73,8 @@ interface Props { highlightPadding?: number /** 高亮圆角,默认16 */ highlightRadius?: number + /** 垂直偏移(仅Y轴),支持 number(px) 或 '10%'/'120px' */ + positionOffsetY?: number | string } interface Emits { @@ -78,7 +90,8 @@ const props = withDefaults(defineProps(), { autoPlayInterval: 0, highlightSelector: null, highlightPadding: 8, - highlightRadius: 16 + highlightRadius: 16, + positionOffsetY: '50%' }) const emit = defineEmits() @@ -138,7 +151,7 @@ const currentStepContent = computed(() => { if (!step) return '' if (!step.title) { - return `

${step.content}

` + return `${step.content}` } return ` diff --git a/src/components/Guide/GuideStepsItem.vue b/src/components/Guide/GuideStepsItem.vue index 4987873..7919808 100644 --- a/src/components/Guide/GuideStepsItem.vue +++ b/src/components/Guide/GuideStepsItem.vue @@ -2,7 +2,7 @@ import('@/views/vlog/video/index.vue'), + meta: { + title: '视频' + } } ] diff --git a/src/utils/index.ts b/src/utils/index.ts index 0994741..fe1e60a 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -93,6 +93,7 @@ export const IMAGE_PATHS = { START: 'home/按钮/开始', COMPLETE: 'home/按钮/完成', CANCEL: 'home/按钮/取消', + CLOSE: 'home/按钮/关闭', //继续 continue CONTINUE: 'components/continue', //跳过 escape @@ -104,6 +105,13 @@ export const IMAGE_PATHS = { //开始拍摄 START_FILMING: 'home/guide/action-btn' }, + + //components + COMPONENTS: { + CLOSE: 'components/close', + //返回 + BACK: 'components/back' + }, // ai工具组镜头按钮 AI_TOOLS_BUTTONS: { BACK: 'home/ai工具组镜头/返回', diff --git a/src/views/vlog/index.vue b/src/views/vlog/index.vue index bc550f4..23107a5 100644 --- a/src/views/vlog/index.vue +++ b/src/views/vlog/index.vue @@ -2,11 +2,12 @@ import { getBackgroundImage, IMAGE_PATHS } from '@/utils' import { ImgButton } from '@/components/Button' -import { ref } from 'vue' +import { onMounted, ref } from 'vue' import { ProgressBar } from '@/components' -import { useRouter } from 'vue-router' +import { useRouter, useRoute } from 'vue-router' const router = useRouter() +const route = useRoute() const currentStep = ref(0) @@ -25,6 +26,12 @@ const handleWorkClick = () => { // 处理任务取景按钮点击逻辑 router.push({ name: 'Work' }) } + +onMounted(() => { + if (route.query.key === 'video') { + currentStep.value = 1 + } +})