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 @@
-
+
+
@@ -263,9 +273,6 @@
-
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 4944629..856ef77 100644
--- a/src/views/Workshop/homeNav.vue
+++ b/src/views/Workshop/homeNav.vue
@@ -1,9 +1,14 @@