diff --git a/src/views/Workshop/homeNav.vue b/src/views/Workshop/homeNav.vue
index 856ef77..2463de8 100644
--- a/src/views/Workshop/homeNav.vue
+++ b/src/views/Workshop/homeNav.vue
@@ -58,7 +58,7 @@ onMounted(()=>{
 			flowTypeList: [FlowType.H_TRYON,FlowType.H_AI],
 		},
 		{
-			path: 'recommended',
+			path: 'product',
 			imgPath: new URL('@/assets/images/nav2.png',import.meta.url).href,
 			flowTypeList: [FlowType.H_OUTFIT],
 		},
diff --git a/src/views/Workshop/product.vue b/src/views/Workshop/product.vue
index f139201..bbce885 100644
--- a/src/views/Workshop/product.vue
+++ b/src/views/Workshop/product.vue
@@ -1,12 +1,10 @@
 <script setup lang="ts">
-import { onMounted, onUnmounted, reactive, ref, toRefs } from "vue";
-import HeaderTitle from '@/components/HeaderTitle.vue'
-import FooterNavigation from '@/components/FooterNavigation.vue'
+import { onMounted, onUnmounted, reactive, ref, toRefs, computed } from "vue";
 import { useRouter, useRoute } from 'vue-router'
 import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue'
-import { useGenerateStore } from '@/stores'
+import { useGenerateStore, useHGenerateStore } from '@/stores'
 import { generateTryOnEffect, setTryOnEffectFavorite, cancelTryOnEffectFavorite, addTryOnEffectComment  } from '@/api/workshop'
-import { FlowType } from '@/types/enum'
+import { FlowType, IsHistoryFlow } from '@/types/enum'
 
 const router = useRouter()
 //const props = defineProps({
@@ -19,8 +17,11 @@ let data = reactive({
 	],
 	isLoading: false,
 })
-
+const query = computed(() => router.currentRoute.value.query)
 const generateStore = useGenerateStore()
+const hGenerateStore = useHGenerateStore()
+
+const isHistoryFlow = computed(() => IsHistoryFlow(query.value.flowType))
 
 const vanDialogShow = ref(false)
 const feedbackForm = ref({
@@ -34,11 +35,10 @@ const feedbackForm = ref({
 
 
 const onContinue = ()=>{
-	const query = router.currentRoute.value.query
-	if(query?.flowType == FlowType.MAIN){
-		router.push({ path: 'uploadFace', query: {...query} })
+	if(!isHistoryFlow.value){
+		router.push({ path: 'uploadFace', query: {...query.value} })
 	}else{
-		router.push({ path: 'creation', query: {...query} })
+		router.push({ path: 'creation', query: {...query.value} })
 	}
 }
 
@@ -51,7 +51,7 @@ const startGenerate = ()=>{
 	let value = {
 		customerId:generateStore.customerId,
 		visitRecordId:generateStore.visitRecordId,
-		styleId:generateStore.styleId,
+		styleId:isHistoryFlow.value ? hGenerateStore.styleId : generateStore.styleId,
 		// customerPhotoId:null,
 		// modelPhotoId:null,
 		// prompt:null,
@@ -63,7 +63,7 @@ const startGenerate = ()=>{
 		generateStore.originalTryOn.isLike = false
 		generateStore.originalTryOn.id = res.tryOnId
 		generateStore.originalTryOn.tryOnUrl = res.tryOnUrl
-		generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式
+		// generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式
 		generateStore.setIsGenerate(false)
 
 		generateStore.clearCustomizeInfo()
diff --git a/src/views/Workshop/selectStyle.vue b/src/views/Workshop/selectStyle.vue
index 37d2dd8..69a5efa 100644
--- a/src/views/Workshop/selectStyle.vue
+++ b/src/views/Workshop/selectStyle.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
-import { onMounted, onUnmounted, reactive, toRefs, computed, onActivated } from "vue";
+import { onMounted, onUnmounted, reactive, toRefs, computed, ref } from "vue";
 import SelectItem from "@/components/selectStyle/selectItem.vue";
-import HeaderTitle from '@/components/HeaderTitle.vue'
-import FooterNavigation from '@/components/FooterNavigation.vue'
-import { useRouter } from 'vue-router'
-import { useGenerateStore, useUserInfoStore } from '@/stores'
+import { useRouter, useRoute } from 'vue-router'
+import { useGenerateStore, useUserInfoStore, useHGenerateStore } from '@/stores'
 import { showToast } from 'vant';
-import { generateRequestOutfit, getRequestOutfit } from '@/api/workshop'
-import { FlowType } from '@/types/enum'
+import { shareImageToWhatsapp } from '@/utils/tools'
+import { generateRequestOutfit, getRequestOutfit, setStyleFavorite, cancelStyleFavorite, retrieveAndRegenerate } from '@/api/workshop'
+import { FlowType, IsHistoryFlow } from '@/types/enum'
+import GenerateLoading from '@/views/asistant/components/GenerateLoading.vue'
+import gradientButton from '@/components/gradientButton.vue'
 
 const router = useRouter()
-
+const route = useRoute()
 //const props = defineProps({
 //})
 const emit = defineEmits([
@@ -18,125 +19,190 @@ const emit = defineEmits([
 ])
 const generateStore = useGenerateStore()
 const userInfoStore = useUserInfoStore()
+const hGenerateStore = useHGenerateStore()
+
+const query = computed(() => route.query)
+const isHistoryFlow = computed(() => IsHistoryFlow(query.value.flowType))
+const isLoading = ref(false)
+const loadingTitle= ref('Analyzing the Outfit...')
+// const loadingTitle = computed(()=>{
+// 	let str = ''
+// 	if(!select.value.status)str = 'Analyzing the Outfit...'
+// 	if(select.value.status == 'RUNNING')str = 'Generating Results...'
+// 	if(select.value.status == 'PENDING')str = 'Almost there...'
+// 	return str
+// })
+
 let data = reactive({
 	select:computed(()=>generateStore.style),
-	styleList:computed(()=>generateStore.styleList),
+	// styleList:computed(()=>generateStore.styleList),
 })
 
 let getGenerateTime = null as any
 
-const selectItem = (item)=>{
-	if(!item.id || item.status != 'SUCCEEDED'){
-		return
+const updateStyle = ()=>{
+	// generateStore.updateStyle(item)
+	// data.styleList[index] = {}
+	requestOutfit({num:1})
+}
+const setLikeStyle = (likeStyle)=>{
+	if(!select.value.id)return
+	if(likeStyle){
+		cancelStyleFavorite(select.value.id).then(()=>{
+			select.value.isLike = false
+		})
+	}else{
+		setStyleFavorite(select.value.id).then(()=>{
+			select.value.isLike = true
+		})
 	}
-	generateStore.selectStyle(item)
 }
 
-const updateStyle = ({item,index})=>{
-	generateStore.updateStyle(item)
-	data.styleList[index] = {}
-	requestOutfit({num:1,index})
+const setDownload = ()=>{
+	if(select.value.path)shareImageToWhatsapp(select.value.path)
 }
 
 const toProduct = ()=>{
-	if(!generateStore.style.id){
-		showToast({ message: 'Please select a style.' });
-		return
-	}
-	if(generateStore.style.id != generateStore.style.oldId){
-		generateStore.setIsGenerate(true)
-	}
-	const query = router.currentRoute.value.query
-	if(query?.flowType == FlowType.MAIN){
-		router.push({ path: 'product', query: {...query} })
+	// if(generateStore.style.id){
+	// 	generateStore.setIsGenerate(true)
+	// }
+	if(!isHistoryFlow.value){
+		router.push({ path: 'product', query: {...query.value} })
 	}else{
-		router.push({ path: 'creation', query: {...query} })
+		router.push({ path: 'creation', query: {...query.value, active: FlowType.H_OUTFIT} })
 	}
 }
 
-const requestOutfit = ({num,index})=>{
-	let value = {
-		"customerId": generateStore.customerId,
-		"checkInId": generateStore.visitRecordId,
-		"stylist": userInfoStore.state.generateParams.stylist,
-		"gender": userInfoStore.state.generateParams.sex,
-		"sessionId": generateStore.sessionId,
-		num,
-	}
-	generateRequestOutfit(value).then((rv)=>{
-		let rvIndex = 0
-		data.styleList.forEach((item,styleIndex)=>{
-			if(styleIndex < index)return
-			item.taskId = rv[rvIndex]
-			rvIndex++
-		})
-		getRequestOutfitList(rv)
+const requestOutfit = async ({num})=>{
+	let rv = await new Promise<void>((resolve, reject) => {
+		if(isHistoryFlow.value){
+			retrieveAndRegenerate({tryOnEffectsId:hGenerateStore.originalTryOn.id}).then((rv:any)=>{
+				resolve(rv)
+			})
+		}else{
+			let value = {
+				"customerId": generateStore.customerId,
+				"checkInId": generateStore.visitRecordId,
+				"stylist": userInfoStore.state.generateParams.stylist,
+				"gender": userInfoStore.state.generateParams.sex,
+				"sessionId": generateStore.sessionId,
+				num,
+			}
+			generateRequestOutfit(value).then((rv:any)=>{
+				resolve(rv)
+			})
+		}
 	})
+	isLoading.value = true
+	generateStore.clearStyle()
+	data.select.taskId = rv[0]
+	getRequestOutfitList(rv)
 }
 
 const getRequestOutfitList = (generateList)=>{
 	let value = {requestIDs:generateList.join(',')}
 	getRequestOutfit(value).then((rv:any)=>{
-		let pendingList = []
 		rv.forEach((item)=>{
-			if(['RUNNING','PENDING'].includes(item.status))pendingList.push(item.requestId)
-			let index = data.styleList.findIndex((styleItem)=>styleItem.taskId == item.requestId)
-			if(index != -1){
-				data.styleList[index].id = item.id
-				data.styleList[index].path = item.path
-				data.styleList[index].status = item.status
-			}
+			data.select.id = item.id
+			data.select.path = item.path
+			data.select.status = item.status
 		})
 
-		if(pendingList.length > 0){
+		if(['RUNNING','PENDING'].includes(data.select.status)){
 			getGenerateTime = setTimeout(()=>{
-				getRequestOutfitList(pendingList)
+				getRequestOutfitList([data.select.taskId])
 			},3000)
+		}else{
+			isLoading.value = false
 		}
 	})
 }
 
 onMounted(()=>{
 	// generateStore.clearProductData()
+
 	emit('view-type', 1)
 	// if(!data.styleList[0]?.id)getRequestOutfitList(0)
 	if(getGenerateTime)clearTimeout(getGenerateTime)
-	if(!data.styleList[0]?.taskId){
-		requestOutfit({num:4,index:0})
-	}else if(data.styleList.filter((item)=>item?.status != 'SUCCEEDED').length > 0){
-		let generateList = data.styleList.map((item)=>item.taskId)
-		getRequestOutfitList(generateList)
+	if(data.select.status == 'SUCCEEDED'){
+		return
+	}else if(!data.select?.taskId){
+		requestOutfit({num:1})
+	}else if(data.select.status != 'SUCCEEDED'){
+		isLoading.value = true
+		// let generateList = [data.styleList[0].taskId]
+		getRequestOutfitList([data.select.taskId])
 	}
 })
 onUnmounted(()=>{
 	if(getGenerateTime)clearTimeout(getGenerateTime)
 })
 defineExpose({})
-const { styleList, select } = toRefs(data);
+const { select } = toRefs(data);
 </script>
 <template>
 	<div class="selectStyle">
 		<div class="text">
 			<div class="title">
-				What’s your Style?
+				Outfit Result
 			</div>
 			<div class="info">
-				Select the outfit that matches you the most.
+				Refine your Look
 			</div>
 		</div>
-		<div class="selectContent flex-1">
-			<SelectItem :selectList="styleList" v-model:select="select" @selectItem="selectItem" @updateStyle="updateStyle" />
+		<div class="selectContent">
+			<!-- {{ select }} -->
+			<div class="imgBox">
+				<img :src="select.path" alt="">
+			</div>
+			<div class="btn">
+				<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 class="footer">
-			<button class="flex flex-center" @click.stop="toProduct">Continue</button>
+		<div class="btn">
+			<div class="btnItem style1" @click.stop="updateStyle()">
+				<gradientButton>
+					<template #content>
+						<div class="text">
+							<span class="icon">
+								<SvgIcon name="reTry" size="40" />
+							</span>
+							Re-try
+						</div>
+						
+					</template>
+				</gradientButton>
+			</div>
+			<div class="btnItem style2" @click.stop="toProduct">Continue</div>
 		</div>
 	</div>
 	<!-- <div class="footer placeholder"></div> -->
+	<div class="loading-container" v-if="isLoading">
+      <GenerateLoading :title="loadingTitle"/>
+    </div>
 </template>
 <style lang="less" scoped>
 	.header-title {
 		// --header-title-background: #f6f6f6;
 	}
+	.loading-container{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		z-index: 2;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 	.selectStyle{
 		width: 100%;
 		flex: 1;
@@ -149,12 +215,12 @@ const { styleList, select } = toRefs(data);
 		> .text{
 			text-align: center;
 			width: 100%;
-			margin-top: 3rem;
-			margin-bottom: 4.9rem;
+			margin-top: 8.5rem;
+			margin-bottom: 8.5rem;
 			> .title{
 				font-family: satoshiBold;
 				font-weight: 700;
-				font-size: 9.6rem;
+				font-size: 8.6rem;
 				line-height: 124%;
 				color: #000;
 			}
@@ -162,46 +228,74 @@ const { styleList, select } = toRefs(data);
 				font-size: 4rem;
 				font-weight: 400;
 				line-height: 124%;
-				margin-top: 1.3rem;
+				margin-top: 3.2rem;
 				color: rgba(0, 0, 0, 0.6);
 			}
 		}
 		.selectContent{
-			padding: 0 4rem;
+			// padding: 0 4rem;
+			margin: 0 auto;
 			overflow: auto;
+			width: 73.7rem;
+			margin-bottom: 19.4rem;
+			> .imgBox{
+				height: 73.7rem;
+				width: 100%;
+				margin-bottom: 4.4rem;
+				> img{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			> .btn{
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				gap: 2rem;
+				> div{
+					color: #000;
+					border-radius: 50%;
+					width: 7rem;
+					height: 7rem;
+					padding: 1rem;
+					background-color: #fff;
+					&:hover{
+						color: #000;
+					}
+				}
+			}
 		}
-	}
-	.footer {
-		// position: fixed;
-		// margin-top: 4.4rem;
-		// padding: 4rem 4rem 0 0;
-		margin-top: auto;
-		margin-bottom: 5.6rem;
-		margin-right: 4rem;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		// position: absolute;
-		// right: 4rem;
-		// bottom: 4rem;
-		height: 6.7rem;
-		// background-color: #f6f6f6;
-		&.placeholder{
-			position: relative;
-		}
-		> button {
-			// margin-right: 5rem;
-			border-radius: .7rem;
-			border: 3px solid #000;
-			background-color: #000;
-			text-align: center;
-			color: #fff;
-			font-family: satoshiMedium;
-			font-size: 3.6rem;
-			width: 24.6rem;
-			height: 6.7rem;
-			box-sizing: border-box;
-			line-height: 6.7rem;
+		> .btn{
+			display: flex;
+			gap: 6.6rem;
+			justify-content: center;
+			> div {
+				border-radius: .96rem;
+				width: 33.7rem;
+				font-size: 4.8rem;
+				font-family: satoshiMedium;
+				line-height: 9.2rem;
+				display: flex;
+				justify-content: center;
+				&.style1{
+					--borderRadius: .96rem;
+					--borderWidth: 2px;
+					.text{
+						width: 100%;
+						text-align: center;
+						> .icon{
+							left: 4rem;
+							top: 50%;
+							transform: translateY(-50%);
+							position: absolute;
+						}
+					}
+				}
+				&.style2{
+					color: #fff;	
+					background-color: #000;
+				}
+			}
 		}
 	}
 </style>
\ No newline at end of file