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

src/views/Workshop/product.vue

@@ -132,7 +132,7 @@ const { isLoading } = toRefs(data);
 	<div class="product" v-if="!isLoading">
 		<div class="text">
 			<div class="title">
-				Go with this look?
+				{{ isHistoryFlow?'Generate Result':'Go with this look?' }}
 			</div>
 		</div>
 		<div class="selectContent">
@@ -303,6 +303,9 @@ const { isLoading } = toRefs(data);
 						background-color: #000;
 					}
 				}
+				.btnItem .text{
+					color: #000;
+				}
 			}
 		}
 	}

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()">
@@ -281,6 +281,7 @@ const { styleListVue } = toRefs(dataDom);
 				height: 7.6rem;
 				.text{
 					font-size: 3.1rem;
+					color: #000;
 					font-family: satoshiMedium;
 				}
 			}
@@ -333,6 +334,9 @@ const { styleListVue } = toRefs(dataDom);
 					background-color: #000;
 				}
 			}
+			.btnItem .text{
+				color: #000;
+			}
 		}
 	}
 </style>