From 41e605a8bf62277d8813659953748f2a650b2637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Mon, 22 Dec 2025 13:02:53 +0800 Subject: [PATCH] view --- src/assets/css/style.css | 2 +- src/assets/css/style.less | 2 +- src/types/enum.ts | 5 ++ src/views/Workshop/creation/creation-list.vue | 7 +- src/views/Workshop/customize.vue | 64 +++++++++++-------- src/views/Workshop/uploadFace1.vue | 33 +++++----- src/views/Workshop/uploadFace2.vue | 12 ++-- 7 files changed, 76 insertions(+), 49 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 469c74a..54421fd 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -3,7 +3,7 @@ button.sandblasted-blurred { border: 0.4rem solid #fff; font-family: satoshiMedium; font-weight: 500; - font-size: 5.5rem; + font-size: 4rem; color: #fff; background-color: transparent; position: relative; diff --git a/src/assets/css/style.less b/src/assets/css/style.less index 448580c..92be47b 100644 --- a/src/assets/css/style.less +++ b/src/assets/css/style.less @@ -3,7 +3,7 @@ button.sandblasted-blurred { border: 0.4rem solid #fff; font-family: satoshiMedium; font-weight: 500; - font-size: 5.5rem; + font-size: 4rem; color: #fff; background-color: transparent; position: relative; diff --git a/src/types/enum.ts b/src/types/enum.ts index 889e944..f5f7ecc 100644 --- a/src/types/enum.ts +++ b/src/types/enum.ts @@ -10,4 +10,9 @@ export const FlowType = { H_TRYON: 'history-tryon', /** 历史流程-AI */ H_AI: 'history-ai', +} +/** 是否是历史流程 */ +export const IsHistoryFlow = (flowType: any) => { + const arr = [FlowType.HISTORY, FlowType.H_OUTFIT, FlowType.H_TRYON, FlowType.H_AI] + return arr.some((v) => v === flowType) } \ No newline at end of file diff --git a/src/views/Workshop/creation/creation-list.vue b/src/views/Workshop/creation/creation-list.vue index 83e3e92..e2cde29 100644 --- a/src/views/Workshop/creation/creation-list.vue +++ b/src/views/Workshop/creation/creation-list.vue @@ -35,12 +35,16 @@ { label: 'Try-on', value: 'tryOn', flowType: FlowType.H_TRYON }, { label: 'Gen-AI', value: 'genAi', flowType: FlowType.H_AI } ] - const navActive = ref('outfit') + const navActive = ref('outfit'); + navLst.forEach((v) => { + if (v.flowType === query.value.flowType) navActive.value = v.value + }) const clickNav = (v) => { navActive.value = v.value console.log(v) } const onLoad = () => { + console.log(navActive.value) loading.value = true const http = visitRecordId.value ? getTryOnEffectFavoriteList : getTryOnEffectStyleList const id = visitRecordId.value || generateStore.styleId @@ -200,6 +204,7 @@ const selectedItem = list.find((v) => v.selected) const nav = navLst.find((v) => v.value === navActive.value) if (!selectedItem || !nav) return + console.log(selectedItem, nav) router.push({ name: 'HomeNav', query: { flowType: nav.flowType } }) } else { router.push({ name: 'end' }) diff --git a/src/views/Workshop/customize.vue b/src/views/Workshop/customize.vue index 84e0a75..9f2f96b 100644 --- a/src/views/Workshop/customize.vue +++ b/src/views/Workshop/customize.vue @@ -1,6 +1,4 @@ diff --git a/src/views/Workshop/uploadFace1.vue b/src/views/Workshop/uploadFace1.vue index 82c6c60..9dd992c 100644 --- a/src/views/Workshop/uploadFace1.vue +++ b/src/views/Workshop/uploadFace1.vue @@ -2,6 +2,7 @@ import { ref, onMounted, computed } from 'vue' import { useRouter, useRoute } from 'vue-router' import { useGenerateStore } from '@/stores' + import { IsHistoryFlow } from '@/types/enum' const generateStore = useGenerateStore() const emit = defineEmits(['view-type']) onMounted(() => { @@ -10,7 +11,7 @@ const router = useRouter() const route = useRoute() const query = computed(() => route.query) - const isDemo = computed(() => route.query.demo === '1') + const isHistoryFlow = computed(() => IsHistoryFlow(query.value.flowType)) // 上传照片 const handleUploadFace = () => { // generateStore.updatePhotoInfo({}) @@ -18,18 +19,14 @@ } // 跳过上传 const handleFinish = () => { - if (isDemo.value) { - handleUploadFace(); - } else { - generateStore.updatePhotoInfo({}) - generateStore.clearCustomizeInfo() - generateStore.uploadCustomizeInfo({ - tryOnId: generateStore.originalTryOn.id, - tryOnUrl: generateStore.originalTryOn.tryOnUrl, - isFavorite: generateStore.originalTryOn.isLike - }) - router.push({ name: 'customize', query: query.value }) - } + generateStore.updatePhotoInfo({}) + generateStore.clearCustomizeInfo() + generateStore.uploadCustomizeInfo({ + tryOnId: generateStore.originalTryOn.id, + tryOnUrl: generateStore.originalTryOn.tryOnUrl, + isFavorite: generateStore.originalTryOn.isLike + }) + router.push({ name: 'customize', query: query.value }) } @@ -48,7 +45,13 @@ - + @@ -97,7 +100,7 @@ border-radius: 0.7rem; margin: 0 1.8rem; &.sandblasted-blurred { - border-width: 0.2rem; + // border-width: 0.2rem; } } } diff --git a/src/views/Workshop/uploadFace2.vue b/src/views/Workshop/uploadFace2.vue index 62598e4..d65d254 100644 --- a/src/views/Workshop/uploadFace2.vue +++ b/src/views/Workshop/uploadFace2.vue @@ -3,6 +3,7 @@ import { useRouter, useRoute } from 'vue-router' import { uploadCustomerPhoto } from '@/api/workshop' import { useGenerateStore } from '@/stores' + import { IsHistoryFlow } from '@/types/enum' const generateStore = useGenerateStore() const emit = defineEmits(['view-type']) @@ -12,7 +13,7 @@ const router = useRouter() const route = useRoute() const query = computed(() => route.query) - const isDemo = computed(() => route.query.demo === '1') + const isHistoryFlow = computed(() => IsHistoryFlow(query.value.flowType)) const fileData = generateStore.photoInfo if (!fileData.file?.size) generateStore.updatePhotoInfo({}) // 上传照片 @@ -46,7 +47,7 @@ formData.append('file', fileData.file) uploadCustomerPhoto(formData).then((res) => { generateStore.updatePhotoInfo({ ...res, file: fileData.file }) - isDemo.value ? generateStore.clearCustomizeInfoDemo() : generateStore.clearCustomizeInfo() + isHistoryFlow.value ? generateStore.clearCustomizeInfoDemo() : generateStore.clearCustomizeInfo() router.push({ name: 'customize', query: query.value }) }) } @@ -144,10 +145,11 @@ display: flex; justify-content: center; > button { - width: 34.5rem; - height: 8.6rem; - border-radius: 4.3rem; + width: 35rem; + height: 8.3rem; margin: 0 5rem; + // border-radius: 4.3rem; + border-width: 0.25rem; } } }