From 53264e209be9e57e2e8bc9757a2ab1b988727589 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:42:55 +0800 Subject: [PATCH] fix --- src/views/Workshop/creation/creation-list.vue | 17 ++-- src/views/Workshop/customize.vue | 90 +++++++------------ src/views/Workshop/homeNav.vue | 24 +++-- 3 files changed, 62 insertions(+), 69 deletions(-) diff --git a/src/views/Workshop/creation/creation-list.vue b/src/views/Workshop/creation/creation-list.vue index e2cde29..238d09c 100644 --- a/src/views/Workshop/creation/creation-list.vue +++ b/src/views/Workshop/creation/creation-list.vue @@ -204,7 +204,14 @@ const selectedItem = list.find((v) => v.selected) const nav = navLst.find((v) => v.value === navActive.value) if (!selectedItem || !nav) return - console.log(selectedItem, nav) + generateStore.clearCustomizeInfoDemo(); + generateStore.uploadCustomizeInfoDemo({ + tryOnId: selectedItem.tryOnId, + tryOnUrl: selectedItem.tryOnUrl, + styleUrl: selectedItem.styleUrl, + isFavorite: selectedItem.isFavorite, + isRegenerated: selectedItem.isRegenerated, + }) router.push({ name: 'HomeNav', query: { flowType: nav.flowType } }) } else { router.push({ name: 'end' }) @@ -253,7 +260,10 @@ -
+
+ +
+
-
- -
diff --git a/src/views/Workshop/customize.vue b/src/views/Workshop/customize.vue index 9f2f96b..77b2ede 100644 --- a/src/views/Workshop/customize.vue +++ b/src/views/Workshop/customize.vue @@ -39,63 +39,41 @@ customizeInfo.oldInputText = customizeInfo.inputText customizeInfo.oldTryOnId = customizeInfo.tryOnId loading.value = true - if (isHistoryFlow.value) { - // const data = { - // prompt: customizeInfo.inputText, - // tryonUrl: customizeInfo.tryOnUrl - // } - // if (generateStore.customerPhotoId && customizeInfo.count === 0) { - // data['customerPhotoId'] = generateStore.customerPhotoId - // } - const data = new FormData() - data.append('prompt', customizeInfo.inputText) - data.append('tryonUrl', customizeInfo.tryOnUrl) - if (generateStore.customerPhotoId && customizeInfo.count === 0) { - data.append('customerPhotoId', generateStore.customerPhotoId) - } - generateTryOnEffectDemo(data) - .then((res: any) => { - if (!res) return Promise.reject('生成失败') - customizeInfo.count++ - customizeInfo.tryOnId = '1' - customizeInfo.tryOnUrl = res - // customizeInfo.styleUrl = res.styleUrl - // customizeInfo.isRegenerated = res.isRegenerated - // customizeInfo.isFavorite = !!res.isFavorite - loading.value = false - }) - .catch((err) => { - console.error(err) - loading.value = false - }) - } else { - const data = { - customerId: generateStore.customerId, - visitRecordId: generateStore.visitRecordId, - styleId: generateStore.styleId, - // modelPhotoId: generateStore.modelPhotoId, - originalTryOnId: type === 'reload' ? customizeInfo.oldTryOnId : generateStore.originalTryOnId, - isRegenerated: 1, - prompt: customizeInfo.inputText - } - if (generateStore.customerPhotoId && customizeInfo.count === 0) - data['customerPhotoId'] = generateStore.customerPhotoId - generateTryOnEffect(data) - .then((res: any) => { - customizeInfo.count++ - customizeInfo.tryOnId = res.tryOnId - customizeInfo.tryOnUrl = res.tryOnUrl - customizeInfo.styleUrl = res.styleUrl - customizeInfo.isRegenerated = res.isRegenerated - customizeInfo.isFavorite = !!res.isFavorite - loading.value = false - }) - .catch((err) => { - console.error(err) - if (data['customerPhotoId']) router.back() - loading.value = false - }) + const data = { + customerId: generateStore.customerId, + visitRecordId: generateStore.visitRecordId, + // styleId: generateStore.styleId, + // modelPhotoId: generateStore.modelPhotoId, + // originalTryOnId: type === 'reload' ? customizeInfo.oldTryOnId : generateStore.originalTryOnId, + isRegenerated: 1, + prompt: customizeInfo.inputText } + if (generateStore.customerPhotoId && customizeInfo.count === 0) { + data['customerPhotoId'] = generateStore.customerPhotoId + } + if (isHistoryFlow.value) { + data['originalTryOnId'] = + type === 'reload' ? customizeInfo.oldTryOnId : generateStore.customizeInfoDemo.tryOnId + } else { + data['styleId'] = generateStore.styleId + data['originalTryOnId'] = + type === 'reload' ? customizeInfo.oldTryOnId : generateStore.originalTryOnId + } + generateTryOnEffect(data) + .then((res: any) => { + customizeInfo.count++ + customizeInfo.tryOnId = res.tryOnId + customizeInfo.tryOnUrl = res.tryOnUrl + customizeInfo.styleUrl = res.styleUrl + customizeInfo.isRegenerated = res.isRegenerated + customizeInfo.isFavorite = !!res.isFavorite + loading.value = false + }) + .catch((err) => { + console.error(err) + if (data['customerPhotoId']) router.back() + loading.value = false + }) } if (customizeInfo.tryOnId === '') generate() diff --git a/src/views/Workshop/homeNav.vue b/src/views/Workshop/homeNav.vue index 196178e..f0580fc 100644 --- a/src/views/Workshop/homeNav.vue +++ b/src/views/Workshop/homeNav.vue @@ -4,6 +4,10 @@ import { useRouter } from 'vue-router' const router = useRouter() import { showConfirmDialog } from 'vant' import MyEvent from '@/utils/myEvent' +import { FlowType, IsHistoryFlow } from '@/types/enum' +import { useGenerateStore } from '@/stores' +const generateStore = useGenerateStore() + //const props = defineProps({ //}) @@ -31,9 +35,10 @@ const clickSwitchVIPID = ()=>{ }) .catch(() => {}) } -const openFlow = (path:string)=>{ +const openFlow = (item: any)=>{ const query = computed(() => router.currentRoute.value.query) - router.push({ name: path, query: {...query.value} }) + item.click && item.click() + router.push({ name: item.path, query: {...query.value} }) // if(flowType == 'clientId')return clickSwitchVIPID() // if(flowType == 'main'){ @@ -49,22 +54,25 @@ onMounted(()=>{ { path: 'selectStyle', imgPath: new URL('@/assets/images/nav1.png',import.meta.url).href, - flowTypeList: ['history-tryon','history-ai'], + flowTypeList: [FlowType.H_TRYON,FlowType.H_AI], }, { path: 'recommended', imgPath: new URL('@/assets/images/nav2.png',import.meta.url).href, - flowTypeList: ['history-outfit'], + flowTypeList: [FlowType.H_OUTFIT], }, { path: 'uploadFace', imgPath: new URL('@/assets/images/nav3.png',import.meta.url).href, - flowTypeList: ['history-tryon','history-ai'], + flowTypeList: [FlowType.H_TRYON,FlowType.H_AI], }, { path: 'customize', imgPath: new URL('@/assets/images/nav4.png',import.meta.url).href, - flowTypeList: ['history-tryon','history-ai'], + flowTypeList: [FlowType.H_TRYON,FlowType.H_AI], + click(){ + generateStore.updatePhotoInfo({}) + }, }, ] nav.forEach((item)=>{ @@ -92,10 +100,10 @@ defineExpose({}) Explore
-
+
-
+