Merge branch 'main' of http://18.167.251.121:10003/aidlab/lanecarford_front

src/views/Workshop/creation/creation-list.vue

@@ -7,7 +7,9 @@
 	import {
 		getGenerateHistoricals,
 		setTryOnEffectFavorite,
-		cancelTryOnEffectFavorite
+		cancelTryOnEffectFavorite,
+		cancelStyleFavorite,
+		setStyleFavorite
 	} from '@/api/workshop'
 	import { useRouter } from 'vue-router'
 	import MyEvent from '@/utils/myEvent'
@@ -113,10 +115,15 @@
 	const isLoveLoading = ref(false)
 	const onLoveItem = (v) => {
 		if (isLoveLoading.value) return
-		const http = v.isFavorite ? cancelTryOnEffectFavorite : setTryOnEffectFavorite
+		var http
+		if (navActive.value === 'Outfit') {
+			http = v.isFavorite ? cancelStyleFavorite : setStyleFavorite
+		} else {
+			http = v.isFavorite ? cancelTryOnEffectFavorite : setTryOnEffectFavorite
+		}
 		isLoveLoading.value = true
 		v.isFavorite = !v.isFavorite
-		http(v.tryOnId)
+		http(v.id)
 			.then(() => {
 				isLoveLoading.value = false
 			})

src/views/Workshop/product.vue

@@ -38,7 +38,7 @@ const onContinue = ()=>{
 	if(!isHistoryFlow.value){
 		router.push({ path: 'uploadFace', query: {...query.value} })
 	}else{
-		router.push({ path: 'creation', query: {...query.value} })
+		router.push({ path: 'creation', query: {...query.value, active: FlowType.H_TRYON } })
 	}
 }