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

src/assets/icons/send_bold.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30.5 16C30.5 16.5682 30.1791 17.0877 29.6709 17.3418L3.6709 30.3418C3.12081 30.6168 2.45842 30.5281 2 30.1182C1.54166 29.7082 1.37965 29.0596 1.5918 28.4824L6.18457 16L1.5918 3.51758C1.37965 2.94039 1.54166 2.29185 2 1.88183C2.45842 1.47186 3.12081 1.38316 3.6709 1.6582L29.6709 14.6582L29.8525 14.7656C30.2544 15.043 30.5 15.5029 30.5 16Z" stroke="#6D6868" stroke-width="3" stroke-linejoin="round"/>
+</svg>

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>

src/views/stylist/dressfor.vue

@@ -4,9 +4,12 @@
       <div class="loading-container flex flex-center">
         <Icon class="icon-element" title="" />
       </div>
-      <div class="text">
+      <!-- <div class="text">
         What are you <br />
         dressing for?
+      </div> -->
+      <div class="slogan flex flex-center">
+        <img class="text" src="@/assets/images/dressfor.png" alt="" />
       </div>
       <!-- <div class="start-btn" @click="handleStart">Start</div> -->
       <div class="chatbox flex flex-center">
@@ -32,7 +35,7 @@
           />
         </div>
         <div class="send flex flex-center" @click="handleSendMessage">
-          <SvgIcon class="send-icon" name="send" size="26" color="#000000" />
+          <SvgIcon class="send-icon" name="send_bold" size="26" color="#6d6868" />
         </div>
       </div>
       <div class="tag-container flex flex-column flex-center">
@@ -239,22 +242,9 @@ onUnmounted(() => {
       }
     }
     .text {
-      font-family: 'satoshiBold';
-      font-size: 9.6rem;
-      text-align: center;
-      padding-top: 9rem;
-      padding-bottom: 14rem;
-
-      font-weight: 700;
-      line-height: 1.12;
-      background: #b3b3b3;
-      background: radial-gradient(80.79% 50% at 50% 50%, #d1c7c2 0%, rgba(255, 255, 255, 0) 100%),
-        radial-gradient(99.56% 93.08% at 99.56% 93.08%, #e6e6e6 0%, #000000 100%)
-          /* warning: gradient uses a rotation that is not supported by CSS and may not behave as expected */,
-        linear-gradient(120.09deg, #b3b3b3 0%, rgba(255, 255, 255, 0) 35.41%);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-      background-clip: text;
+      padding-top: 8.9rem;
+      padding-bottom: 7.7rem;
+      width: 60rem;
     }
     .chatbox {
       height: 9.3rem;