diff --git a/src/stores/modules/generate.ts b/src/stores/modules/generate.ts index 72bf0f4..4be5501 100644 --- a/src/stores/modules/generate.ts +++ b/src/stores/modules/generate.ts @@ -2,6 +2,7 @@ import { defineStore } from 'pinia' import MyEvent from '@/utils/myEvent' MyEvent.add('clear-generate-state', () => useGenerateStore().clearGenerateData()) +MyEvent.add('clear-client-state', () => useGenerateStore().clearCustomerInfo()) export const useGenerateStore = defineStore({ id: 'generate', // 必须指明唯一的pinia仓库的id @@ -176,7 +177,7 @@ export const useGenerateStore = defineStore({ this.updatePhotoInfo({}) this.clearCustomizeInfo() this.clearCustomizeInfoDemo() - this.clearCustomerInfo() + // this.clearCustomerInfo() this.setSessionId('') }, setCustomerInfo(data: any) { diff --git a/src/stores/modules/userInfo.ts b/src/stores/modules/userInfo.ts index f6d3e36..6e2d8bf 100644 --- a/src/stores/modules/userInfo.ts +++ b/src/stores/modules/userInfo.ts @@ -49,6 +49,7 @@ export const useUserInfoStore = defineStore('userInfo', () => { removeLocal('token') resetGenerateParams() MyEvent.emit('clear-generate-state') + MyEvent.emit('clear-client-state') MyEvent.emit('clearAllCache') resolve('') }) diff --git a/src/views/Workshop/creation/creation-list.vue b/src/views/Workshop/creation/creation-list.vue index 793a6ad..0292fec 100644 --- a/src/views/Workshop/creation/creation-list.vue +++ b/src/views/Workshop/creation/creation-list.vue @@ -10,6 +10,7 @@ cancelTryOnEffectFavorite } from '@/api/workshop' import { useRouter } from 'vue-router' + import MyEvent from '@/utils/myEvent' const router = useRouter() const emit = defineEmits(['view-type']) const query = computed(() => router.currentRoute.value.query) @@ -236,6 +237,7 @@ hGenerateStore.style.url = selectedItem.url // selectedItem.isFavorite } + MyEvent.emit('clear-generate-state') router.push({ name: 'HomeNav', query: { flowType: nav.flowType } }) } else { router.push({ name: 'end' }) diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue index 7b867ce..0e08c59 100644 --- a/src/views/Workshop/product.vue +++ b/src/views/Workshop/product.vue @@ -5,6 +5,7 @@ import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue' import { useGenerateStore, useHGenerateStore } from '@/stores' import { generateTryOnEffect, setTryOnEffectFavorite, cancelTryOnEffectFavorite, addTryOnEffectComment } from '@/api/workshop' import { FlowType, IsHistoryFlow } from '@/types/enum' +import gradientButton from '@/components/gradientButton.vue' const router = useRouter() //const props = defineProps({ @@ -64,7 +65,6 @@ const startGenerate = ()=>{ generateStore.originalTryOn.id = res.id generateStore.originalTryOn.tryOnUrl = res.tryOnUrl // generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式 - generateStore.setIsGenerate(false) generateStore.clearCustomizeInfo() }).catch((error)=>{ @@ -121,7 +121,7 @@ const handleSubmit = ()=>{ onMounted(() => { emit('view-type', 1) - if (generateStore.isGenerate) { + if (!generateStore.originalTryOn.id) { startGenerate() } }) @@ -134,7 +134,7 @@ const { isLoading } = toRefs(data);
- Go with this Look? + Generate Result
@@ -150,14 +150,25 @@ const { isLoading } = toRefs(data);
-
-
- - +
+
+ + + +
+
Continue
@@ -190,18 +201,18 @@ const { isLoading } = toRefs(data);