diff --git a/.prettierrc b/.prettierrc index ebb7562..cb78e5e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,13 +3,13 @@ "singleQuote": true, "tabWidth": 2, "useTabs": false, - "trailingComma": "none", - "printWidth": 100, + "trailingComma": "all", + "printWidth": 80, "endOfLine": "lf", - "arrowParens": "avoid", + "arrowParens": "always", "bracketSpacing": true, "bracketSameLine": false, "htmlWhitespaceSensitivity": "ignore", "vueIndentScriptAndStyle": false, - "singleAttributePerLine": false + "singleAttributePerLine": true } diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index ebb7562..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "semi": false, - "singleQuote": true, - "tabWidth": 2, - "useTabs": false, - "trailingComma": "none", - "printWidth": 100, - "endOfLine": "lf", - "arrowParens": "avoid", - "bracketSpacing": true, - "bracketSameLine": false, - "htmlWhitespaceSensitivity": "ignore", - "vueIndentScriptAndStyle": false, - "singleAttributePerLine": false -} diff --git a/src/assets/images/components/教师点评按钮.png b/src/assets/images/components/教师点评按钮.png new file mode 100644 index 0000000..102a7a3 Binary files /dev/null and b/src/assets/images/components/教师点评按钮.png differ diff --git a/src/assets/images/components/置顶.png b/src/assets/images/components/置顶.png new file mode 100644 index 0000000..a68b249 Binary files /dev/null and b/src/assets/images/components/置顶.png differ diff --git a/src/assets/images/film/practice/任务要求.png b/src/assets/images/film/practice/任务要求.png new file mode 100644 index 0000000..58de9f8 Binary files /dev/null and b/src/assets/images/film/practice/任务要求.png differ diff --git a/src/assets/images/film/practice/作品评分表提示.png b/src/assets/images/film/practice/作品评分表提示.png new file mode 100644 index 0000000..bba6d23 Binary files /dev/null and b/src/assets/images/film/practice/作品评分表提示.png differ diff --git a/src/assets/images/film/practice/我的创作笔记.png b/src/assets/images/film/practice/我的创作笔记.png new file mode 100644 index 0000000..624d445 Binary files /dev/null and b/src/assets/images/film/practice/我的创作笔记.png differ diff --git a/src/assets/images/film/practice/电影.png b/src/assets/images/film/practice/电影.png new file mode 100644 index 0000000..1232fc8 Binary files /dev/null and b/src/assets/images/film/practice/电影.png differ diff --git a/src/assets/images/film/practice/电影感短视频创作-作品评分表.png b/src/assets/images/film/practice/电影感短视频创作-作品评分表.png new file mode 100644 index 0000000..4432d42 Binary files /dev/null and b/src/assets/images/film/practice/电影感短视频创作-作品评分表.png differ diff --git a/src/assets/images/film/practice/电影感短视频创作-作品评分表文字.png b/src/assets/images/film/practice/电影感短视频创作-作品评分表文字.png new file mode 100644 index 0000000..b2a28eb Binary files /dev/null and b/src/assets/images/film/practice/电影感短视频创作-作品评分表文字.png differ diff --git a/src/assets/images/film/practice/评分底板-电影感.png b/src/assets/images/film/practice/评分底板-电影感.png deleted file mode 100644 index f139c39..0000000 Binary files a/src/assets/images/film/practice/评分底板-电影感.png and /dev/null differ diff --git a/src/assets/images/film/practice/首页底板.png b/src/assets/images/film/practice/首页底板.png new file mode 100644 index 0000000..2181928 Binary files /dev/null and b/src/assets/images/film/practice/首页底板.png differ diff --git a/src/assets/images/film/shooting/01框架构图_底图.png b/src/assets/images/film/shooting/01框架构图_底图.png index 93a51ce..ce38091 100644 Binary files a/src/assets/images/film/shooting/01框架构图_底图.png and b/src/assets/images/film/shooting/01框架构图_底图.png differ diff --git a/src/assets/images/film/shooting/01框架构图_覆盖.png b/src/assets/images/film/shooting/01框架构图_覆盖.png index 7cd7cc8..5088c83 100644 Binary files a/src/assets/images/film/shooting/01框架构图_覆盖.png and b/src/assets/images/film/shooting/01框架构图_覆盖.png differ diff --git a/src/assets/images/film/shooting/02框架构图_底图.png b/src/assets/images/film/shooting/02框架构图_底图.png index cd1b86a..dfd1020 100644 Binary files a/src/assets/images/film/shooting/02框架构图_底图.png and b/src/assets/images/film/shooting/02框架构图_底图.png differ diff --git a/src/assets/images/film/shooting/02框架构图_覆盖.png b/src/assets/images/film/shooting/02框架构图_覆盖.png index 40b880c..5254208 100644 Binary files a/src/assets/images/film/shooting/02框架构图_覆盖.png and b/src/assets/images/film/shooting/02框架构图_覆盖.png differ diff --git a/src/assets/images/film/shooting/03对称构图_底图.png b/src/assets/images/film/shooting/03对称构图_底图.png index 115d393..c6f0482 100644 Binary files a/src/assets/images/film/shooting/03对称构图_底图.png and b/src/assets/images/film/shooting/03对称构图_底图.png differ diff --git a/src/assets/images/film/shooting/03对称构图_覆盖.png b/src/assets/images/film/shooting/03对称构图_覆盖.png index d143d7f..d85a131 100644 Binary files a/src/assets/images/film/shooting/03对称构图_覆盖.png and b/src/assets/images/film/shooting/03对称构图_覆盖.png differ diff --git a/src/assets/images/film/shooting/04对称构图_底图.png b/src/assets/images/film/shooting/04对称构图_底图.png index e7c73fb..64ef7be 100644 Binary files a/src/assets/images/film/shooting/04对称构图_底图.png and b/src/assets/images/film/shooting/04对称构图_底图.png differ diff --git a/src/assets/images/film/shooting/04对称构图_覆盖.png b/src/assets/images/film/shooting/04对称构图_覆盖.png index 54910d9..48a382b 100644 Binary files a/src/assets/images/film/shooting/04对称构图_覆盖.png and b/src/assets/images/film/shooting/04对称构图_覆盖.png differ diff --git a/src/assets/images/film/shooting/05引导线构图_底图.png b/src/assets/images/film/shooting/05引导线构图_底图.png index 2238e14..4032761 100644 Binary files a/src/assets/images/film/shooting/05引导线构图_底图.png and b/src/assets/images/film/shooting/05引导线构图_底图.png differ diff --git a/src/assets/images/film/shooting/05引导线构图_覆盖.png b/src/assets/images/film/shooting/05引导线构图_覆盖.png index 0c907ea..b675c37 100644 Binary files a/src/assets/images/film/shooting/05引导线构图_覆盖.png and b/src/assets/images/film/shooting/05引导线构图_覆盖.png differ diff --git a/src/assets/images/film/shooting/06引导线构图_底图.png b/src/assets/images/film/shooting/06引导线构图_底图.png index 61bc64d..d6eac70 100644 Binary files a/src/assets/images/film/shooting/06引导线构图_底图.png and b/src/assets/images/film/shooting/06引导线构图_底图.png differ diff --git a/src/assets/images/film/shooting/06引导线构图_覆盖.png b/src/assets/images/film/shooting/06引导线构图_覆盖.png index aa58cc2..b32ca02 100644 Binary files a/src/assets/images/film/shooting/06引导线构图_覆盖.png and b/src/assets/images/film/shooting/06引导线构图_覆盖.png differ diff --git a/src/assets/images/home/guide/cz-btn.png b/src/assets/images/home/guide/cz-btn.png index b10c8af..72530b0 100644 Binary files a/src/assets/images/home/guide/cz-btn.png and b/src/assets/images/home/guide/cz-btn.png differ diff --git a/src/assets/images/interview/composition/三角1-辅助线.png b/src/assets/images/interview/composition/三角1-辅助线.png new file mode 100644 index 0000000..5c7d5e4 Binary files /dev/null and b/src/assets/images/interview/composition/三角1-辅助线.png differ diff --git a/src/assets/images/interview/composition/三角1.png b/src/assets/images/interview/composition/三角1.png new file mode 100644 index 0000000..26f8dc2 Binary files /dev/null and b/src/assets/images/interview/composition/三角1.png differ diff --git a/src/assets/images/interview/composition/三角2-辅助线.png b/src/assets/images/interview/composition/三角2-辅助线.png new file mode 100644 index 0000000..9b90b70 Binary files /dev/null and b/src/assets/images/interview/composition/三角2-辅助线.png differ diff --git a/src/assets/images/interview/composition/三角2.png b/src/assets/images/interview/composition/三角2.png new file mode 100644 index 0000000..95c0309 Binary files /dev/null and b/src/assets/images/interview/composition/三角2.png differ diff --git a/src/assets/images/interview/composition/三角构图.png b/src/assets/images/interview/composition/三角构图.png new file mode 100644 index 0000000..c9cd8c0 Binary files /dev/null and b/src/assets/images/interview/composition/三角构图.png differ diff --git a/src/assets/images/interview/composition/前景1-辅助线.png b/src/assets/images/interview/composition/前景1-辅助线.png new file mode 100644 index 0000000..43d037c Binary files /dev/null and b/src/assets/images/interview/composition/前景1-辅助线.png differ diff --git a/src/assets/images/interview/composition/前景1.png b/src/assets/images/interview/composition/前景1.png new file mode 100644 index 0000000..09b806c Binary files /dev/null and b/src/assets/images/interview/composition/前景1.png differ diff --git a/src/assets/images/interview/composition/前景2-辅助线.png b/src/assets/images/interview/composition/前景2-辅助线.png new file mode 100644 index 0000000..5aa5cc5 Binary files /dev/null and b/src/assets/images/interview/composition/前景2-辅助线.png differ diff --git a/src/assets/images/interview/composition/前景2.png b/src/assets/images/interview/composition/前景2.png new file mode 100644 index 0000000..32cefb4 Binary files /dev/null and b/src/assets/images/interview/composition/前景2.png differ diff --git a/src/assets/images/interview/composition/前景构图.png b/src/assets/images/interview/composition/前景构图.png new file mode 100644 index 0000000..abe5185 Binary files /dev/null and b/src/assets/images/interview/composition/前景构图.png differ diff --git a/src/assets/images/interview/composition/留白1-辅助线.png b/src/assets/images/interview/composition/留白1-辅助线.png new file mode 100644 index 0000000..3e9407d Binary files /dev/null and b/src/assets/images/interview/composition/留白1-辅助线.png differ diff --git a/src/assets/images/interview/composition/留白1.png b/src/assets/images/interview/composition/留白1.png new file mode 100644 index 0000000..2eb1cc9 Binary files /dev/null and b/src/assets/images/interview/composition/留白1.png differ diff --git a/src/assets/images/interview/composition/留白2-辅助线.png b/src/assets/images/interview/composition/留白2-辅助线.png new file mode 100644 index 0000000..9234a4c Binary files /dev/null and b/src/assets/images/interview/composition/留白2-辅助线.png differ diff --git a/src/assets/images/interview/composition/留白2.png b/src/assets/images/interview/composition/留白2.png new file mode 100644 index 0000000..f8729b5 Binary files /dev/null and b/src/assets/images/interview/composition/留白2.png differ diff --git a/src/assets/images/interview/composition/留白构图.png b/src/assets/images/interview/composition/留白构图.png new file mode 100644 index 0000000..871d401 Binary files /dev/null and b/src/assets/images/interview/composition/留白构图.png differ diff --git a/src/assets/images/interview/composition/示意图-三角.png b/src/assets/images/interview/composition/示意图-三角.png new file mode 100644 index 0000000..6233c61 Binary files /dev/null and b/src/assets/images/interview/composition/示意图-三角.png differ diff --git a/src/assets/images/interview/composition/示意图-前景.png b/src/assets/images/interview/composition/示意图-前景.png new file mode 100644 index 0000000..31db49a Binary files /dev/null and b/src/assets/images/interview/composition/示意图-前景.png differ diff --git a/src/assets/images/interview/composition/示意图-留白.png b/src/assets/images/interview/composition/示意图-留白.png new file mode 100644 index 0000000..dfb91bc Binary files /dev/null and b/src/assets/images/interview/composition/示意图-留白.png differ diff --git a/src/assets/images/interview/practice/人物访谈短片创作-作品评分表.png b/src/assets/images/interview/practice/人物访谈短片创作-作品评分表.png new file mode 100644 index 0000000..695e3ad Binary files /dev/null and b/src/assets/images/interview/practice/人物访谈短片创作-作品评分表.png differ diff --git a/src/assets/images/interview/practice/人物访谈短片创作-作品评分表文字.png b/src/assets/images/interview/practice/人物访谈短片创作-作品评分表文字.png new file mode 100644 index 0000000..e2ac5bc Binary files /dev/null and b/src/assets/images/interview/practice/人物访谈短片创作-作品评分表文字.png differ diff --git a/src/assets/images/interview/practice/任务要求.png b/src/assets/images/interview/practice/任务要求.png new file mode 100644 index 0000000..f866b65 Binary files /dev/null and b/src/assets/images/interview/practice/任务要求.png differ diff --git a/src/assets/images/interview/practice/作品评分表提示.png b/src/assets/images/interview/practice/作品评分表提示.png new file mode 100644 index 0000000..cc72666 Binary files /dev/null and b/src/assets/images/interview/practice/作品评分表提示.png differ diff --git a/src/assets/images/interview/practice/我的创作笔记.png b/src/assets/images/interview/practice/我的创作笔记.png new file mode 100644 index 0000000..8c3bbbb Binary files /dev/null and b/src/assets/images/interview/practice/我的创作笔记.png differ diff --git a/src/assets/images/interview/practice/教师点评.png b/src/assets/images/interview/practice/教师点评.png new file mode 100644 index 0000000..511cbda Binary files /dev/null and b/src/assets/images/interview/practice/教师点评.png differ diff --git a/src/assets/images/interview/practice/访谈-匠心育人润物无声.png b/src/assets/images/interview/practice/访谈-匠心育人润物无声.png new file mode 100644 index 0000000..05754c8 Binary files /dev/null and b/src/assets/images/interview/practice/访谈-匠心育人润物无声.png differ diff --git a/src/assets/images/interview/practice/访谈.png b/src/assets/images/interview/practice/访谈.png new file mode 100644 index 0000000..fc0b628 Binary files /dev/null and b/src/assets/images/interview/practice/访谈.png differ diff --git a/src/assets/images/interview/practice/首页底版.png b/src/assets/images/interview/practice/首页底版.png new file mode 100644 index 0000000..8e16247 Binary files /dev/null and b/src/assets/images/interview/practice/首页底版.png differ diff --git a/src/assets/images/interview/shooting/开始拍摄-操场.png b/src/assets/images/interview/shooting/开始拍摄-操场.png new file mode 100644 index 0000000..b29e899 Binary files /dev/null and b/src/assets/images/interview/shooting/开始拍摄-操场.png differ diff --git a/src/assets/images/interview/shooting/开始拍摄-教学楼.png b/src/assets/images/interview/shooting/开始拍摄-教学楼.png new file mode 100644 index 0000000..3deb7c2 Binary files /dev/null and b/src/assets/images/interview/shooting/开始拍摄-教学楼.png differ diff --git a/src/assets/images/vlog/practice/Vlog作品评分表.png b/src/assets/images/vlog/practice/Vlog作品评分表.png new file mode 100644 index 0000000..5b1464d Binary files /dev/null and b/src/assets/images/vlog/practice/Vlog作品评分表.png differ diff --git a/src/assets/images/vlog/practice/vlog-匠心精神劳动承匠心.png b/src/assets/images/vlog/practice/vlog-匠心精神劳动承匠心.png new file mode 100644 index 0000000..4c77fff Binary files /dev/null and b/src/assets/images/vlog/practice/vlog-匠心精神劳动承匠心.png differ diff --git a/src/assets/images/vlog/practice/vlog-熙熙攘攘我们的劳动.png b/src/assets/images/vlog/practice/vlog-熙熙攘攘我们的劳动.png new file mode 100644 index 0000000..48f797d Binary files /dev/null and b/src/assets/images/vlog/practice/vlog-熙熙攘攘我们的劳动.png differ diff --git a/src/assets/images/vlog/practice/vlog.png b/src/assets/images/vlog/practice/vlog.png new file mode 100644 index 0000000..56b4178 Binary files /dev/null and b/src/assets/images/vlog/practice/vlog.png differ diff --git a/src/assets/images/vlog/practice/任务要求.png b/src/assets/images/vlog/practice/任务要求.png new file mode 100644 index 0000000..57d3669 Binary files /dev/null and b/src/assets/images/vlog/practice/任务要求.png differ diff --git a/src/assets/images/vlog/practice/我的创作笔记.png b/src/assets/images/vlog/practice/我的创作笔记.png index 9afb2fa..47a60b6 100644 Binary files a/src/assets/images/vlog/practice/我的创作笔记.png and b/src/assets/images/vlog/practice/我的创作笔记.png differ diff --git a/src/assets/images/vlog/practice/我的创作笔记btn.png b/src/assets/images/vlog/practice/我的创作笔记btn.png new file mode 100644 index 0000000..4b1c06e Binary files /dev/null and b/src/assets/images/vlog/practice/我的创作笔记btn.png differ diff --git a/src/assets/images/vlog/practice/教师点评.png b/src/assets/images/vlog/practice/教师点评.png new file mode 100644 index 0000000..956822d Binary files /dev/null and b/src/assets/images/vlog/practice/教师点评.png differ diff --git a/src/assets/images/vlog/shooting/实地取景底图.png b/src/assets/images/vlog/shooting/实地取景底图.png index c0e0971..f45b725 100644 Binary files a/src/assets/images/vlog/shooting/实地取景底图.png and b/src/assets/images/vlog/shooting/实地取景底图.png differ diff --git a/src/assets/images/vlog/shooting/开始拍摄-沉水栈道.png b/src/assets/images/vlog/shooting/开始拍摄-沉水栈道.png new file mode 100644 index 0000000..31f6100 Binary files /dev/null and b/src/assets/images/vlog/shooting/开始拍摄-沉水栈道.png differ diff --git a/src/assets/images/vlog/shooting/开始拍摄-热带植物馆.png b/src/assets/images/vlog/shooting/开始拍摄-热带植物馆.png new file mode 100644 index 0000000..487f393 Binary files /dev/null and b/src/assets/images/vlog/shooting/开始拍摄-热带植物馆.png differ diff --git a/src/assets/images/work/小手.png b/src/assets/images/work/小手.png index a556daa..d4a8816 100644 Binary files a/src/assets/images/work/小手.png and b/src/assets/images/work/小手.png differ diff --git a/src/components/Guide/GuideSteps.vue b/src/components/Guide/GuideSteps.vue index 8d7b702..e2f8a9b 100644 --- a/src/components/Guide/GuideSteps.vue +++ b/src/components/Guide/GuideSteps.vue @@ -1,14 +1,20 @@ @@ -101,7 +113,7 @@ const props = withDefaults(defineProps(), { highlightRadius: 16, highlightMode: 'border', positionOffsetY: '50%', - visible: true + visible: true, }) const emit = defineEmits() @@ -126,7 +138,7 @@ const alignStyle = reactive<{ top: '0px', transform: 'scale(1)', width: '1920px', - height: '1080px' + height: '1080px', }) const normalizeSelector = (selector?: string | null) => { if (!selector) return null @@ -157,21 +169,25 @@ const currentStepData = computed(() => { return props.steps[currentStepIndex.value] || null }) -const currentStepConfig = computed(() => props.steps[currentStepIndex.value] || null) +const currentStepConfig = computed( + () => props.steps[currentStepIndex.value] || null, +) const currentHighlightSelector = computed(() => { - return normalizeSelector(currentStepConfig.value?.highlightSelector ?? props.highlightSelector) + return normalizeSelector( + currentStepConfig.value?.highlightSelector ?? props.highlightSelector, + ) }) const currentHighlightPadding = computed( - () => currentStepConfig.value?.highlightPadding ?? props.highlightPadding + () => currentStepConfig.value?.highlightPadding ?? props.highlightPadding, ) const currentHighlightRadius = computed( - () => currentStepConfig.value?.highlightRadius ?? props.highlightRadius + () => currentStepConfig.value?.highlightRadius ?? props.highlightRadius, ) const currentHighlightMode = computed( - () => currentStepConfig.value?.highlightMode ?? props.highlightMode + () => currentStepConfig.value?.highlightMode ?? props.highlightMode, ) const currentPositionOffsetY = computed( - () => currentStepConfig.value?.positionOffsetY ?? props.positionOffsetY + () => currentStepConfig.value?.positionOffsetY ?? props.positionOffsetY, ) const currentStepComponent = computed(() => { @@ -210,7 +226,9 @@ const currentStepContentComponent = computed(() => { }) const handleNext = () => { - const maxSteps = useSlotMode.value ? slotSteps.value.length : props.steps.length + const maxSteps = useSlotMode.value + ? slotSteps.value.length + : props.steps.length if (maxSteps === 0) { handleComplete() return @@ -234,7 +252,9 @@ const handleComplete = () => { } const goToStep = (index: number) => { - const maxSteps = useSlotMode.value ? slotSteps.value.length : props.steps.length + const maxSteps = useSlotMode.value + ? slotSteps.value.length + : props.steps.length if (maxSteps === 0) { console.warn('GuideSteps goToStep: No steps available') return @@ -244,7 +264,12 @@ const goToStep = (index: number) => { currentStepIndex.value = index emit('step-change', currentStepData.value, currentStepIndex.value) } else { - console.warn('GuideSteps goToStep: Invalid step index', index, 'max:', maxSteps - 1) + console.warn( + 'GuideSteps goToStep: Invalid step index', + index, + 'max:', + maxSteps - 1, + ) } } @@ -283,7 +308,9 @@ let autoPlayTimer: number | null = null const startAutoPlay = () => { if (props.autoPlayInterval > 0) { autoPlayTimer = window.setInterval(() => { - const maxSteps = useSlotMode.value ? slotSteps.value.length : props.steps.length + const maxSteps = useSlotMode.value + ? slotSteps.value.length + : props.steps.length if (currentStepIndex.value < maxSteps - 1) { handleNext() } else { @@ -317,7 +344,7 @@ onMounted(() => { if (transform && transform !== 'none') { const match = transform.match(/matrix\(([^)]+)\)/) if (match) { - const parts = match[1].split(',').map(s => parseFloat(s.trim())) + const parts = match[1].split(',').map((s) => parseFloat(s.trim())) if (!Number.isNaN(parts[0])) scale = parts[0] } } @@ -343,7 +370,7 @@ defineExpose({ currentStep, totalSteps, startAutoPlay, - stopAutoPlay + stopAutoPlay, }) diff --git a/src/components/Guide/SpotlightOverlay.vue b/src/components/Guide/SpotlightOverlay.vue index 528ee10..3d56e0b 100644 --- a/src/components/Guide/SpotlightOverlay.vue +++ b/src/components/Guide/SpotlightOverlay.vue @@ -1,10 +1,21 @@