Merge branch 'main' of ssh://18.167.251.121:10002/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 } })
 	}
 }
 

src/views/Workshop/selectStyle/index.vue

@@ -172,7 +172,7 @@ const { styleListVue } = toRefs(dataDom);
 			<div class="imgBox">
 				<img :src="select.path" alt="">
 			</div>
-			<div class="chooseMore" @click.stop="styleListInit">
+			<div v-if="!isHistoryFlow" class="chooseMore" @click.stop="styleListInit">
 				<gradientButton>
 					<template #content>
 						<div class="text">
@@ -182,14 +182,14 @@ const { styleListVue } = toRefs(dataDom);
 				</gradientButton>
 				<div></div>
 			</div>
-			<!-- <div class="btn">
+			<div class="btn" v-else>
 				<div class="like" @click.stop="setLikeStyle(select.isLike)">
 					<SvgIcon :name="`love_${select.isLike?1:0}`" size="35" />
 				</div>
 				<div class="down" @click.stop="setDownload()">
 					<SvgIcon name="download" size="35" />
 				</div>
-			</div> -->
+			</div>
 		</div>
 		<div class="btn">
 			<div class="btnItem style1" @click.stop="updateStyle()">