Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

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 @@
 				</div>
 			</my-list>
 		</div>
-		<div class="btns" v-show="!visitRecordId">
+		<div class="creation-footer" v-if="isChooseOne">
+			<button @click="onContinue">Continue</button>
+		</div>
+		<div class="btns" v-else-if="!visitRecordId">
 			<template v-if="!isChooseSave">
 				<button @click="onChooseSave">Choose to Save</button>
 				<button @click="onContinue">Continue</button>
@@ -263,9 +273,6 @@
 				<button @click="onConfirm">Confirm ({{ selectCount }}/{{ maxSelectCount }})</button>
 			</template>
 		</div>
-		<div class="creation-footer" v-if="isChooseOne">
-			<button @click="onContinue">Continue</button>
-		</div>
 	</div>
 </template>
 

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()
 

src/views/Workshop/homeNav.vue

@@ -1,9 +1,14 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, reactive, ref, computed, onActivated } from "vue";
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 const router = useRouter()
+const route = useRoute()
 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 +36,10 @@ const clickSwitchVIPID = ()=>{
 		})
 		.catch(() => {})
 }
-const openFlow = (path:string)=>{
-	const query = router.currentRoute.value.query
-	router.push({ name: path, query: {...query} })
+const openFlow = (item: any)=>{
+	item.click && item.click()
+	const query = route.query
+	router.push({ name: item.path, query: {...query} })
 
 	// if(flowType == 'clientId')return clickSwitchVIPID()
 	// if(flowType == 'main'){
@@ -49,22 +55,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)=>{
@@ -96,10 +105,10 @@ defineExpose({})
 		</div>
 		<div class="navBox">
 			<div class="navList">
-				<div class="item active" v-for="item in navList" :key="item.path" @click="openFlow(item.path)">
+				<div class="item active" v-for="item in navList" :key="item.path" @click="openFlow(item)">
 					<img :src="item.imgPath" alt="">
 				</div>
-				<div class="item" v-for="item in navDisabledList" :key="item.path" @click="openFlow(item.path)">
+				<div class="item" v-for="item in navDisabledList" :key="item.path" @click="openFlow(item)">
 					<img :src="item.imgPath" alt="">
 				</div>
 				<!-- <div class="item" @click="openFlow('index')">