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

src/views/Workshop/homeNav.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, reactive, ref, computed, onActivated } from "vue";
-import { useRouter } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 const router = useRouter()
+const route = useRoute()
 import { showConfirmDialog } from 'vant'
 import MyEvent from '@/utils/myEvent'
 import { FlowType, IsHistoryFlow } from '@/types/enum'
@@ -36,9 +37,9 @@ const clickSwitchVIPID = ()=>{
 		.catch(() => {})
 }
 const openFlow = (item: any)=>{
-	const query = computed(() => router.currentRoute.value.query)
 	item.click && item.click()
-	router.push({ name: item.path, query: {...query.value} })
+	const query = route.query
+	router.push({ name: item.path, query: {...query} })
 
 	// if(flowType == 'clientId')return clickSwitchVIPID()
 	// if(flowType == 'main'){
@@ -91,14 +92,18 @@ defineExpose({})
 </script>
 <template>
 	<div class="homeNavPage">
+		<div class="shadow top"></div>
+		<div class="shadow bottom"></div>
+		<div class="titleBox">
 			<div class="title">
-			Welcome Back,
-			What can I help you today?
+				Choose one<br/>
+				function to explore.
+			</div>
+			<div class="info">
+				Welcome back! What can I help you today?
+			</div>
 		</div>
 		<div class="navBox">
-			<div class="navTitle">
-				Explore
-			</div>
 			<div class="navList">
 				<div class="item active" v-for="item in navList" :key="item.path" @click="openFlow(item)">
 					<img :src="item.imgPath" alt="">
@@ -128,28 +133,46 @@ defineExpose({})
 		--header-title-height: 12rem !important;
 	}
 	.homeNavPage{
-		> .title{
-			padding: 0 8.4rem;
-			font-family: satoshiBold;
-			font-weight: 700;
-			margin-top: 6.8rem;
-			font-size: 9.6rem;
-			line-height: 124%;
-			background: #B3B3B3;
+		> .shadow{
+			position: absolute;
+			width: 91rem;
+			height: 92rem;
+			background: linear-gradient(88.42deg, #FFFFFF 32.58%, #D9D9D9 94.9%);
+			transform: rotate(312deg);
+			&.top{
+				top: -20%;
+				right: -20%;
+			}
+			&.bottom{
+				bottom: -30%;
+				left: -20%;
+				transform: rotate(134deg);
+			}
+		}
+		> .titleBox{
+			padding-left: 7.9rem;
+			margin-top: 13.4rem;
+			margin-bottom: 11.2rem;
+			> div{
 				background: linear-gradient(120deg, #b3b3b3 1%, rgba(0, 0, 0, 0) 48%), linear-gradient(
 				344deg, #B3B3B2 16%, #000000 66%);
 				-webkit-background-clip: text;
 				-webkit-text-fill-color: transparent;
 				background-clip: text;
 			}
-		> .navBox{
-			> .navTitle{
-				padding: 0 8.4rem;
+			> .title{
 				font-family: satoshiBold;
 				font-weight: 700;
-				font-size: 5.2rem;
-				margin: 6.3rem 0;
+				font-size: 10rem;
+				line-height: 124%;
 			}
+			> .info{
+				margin-top: 4.7rem;	
+				font-size: 4rem;
+				font-family: satoshiRegular;
+			}
+		}
+		> .navBox{
 			> .navList{
 				display: flex;
 				flex-wrap: wrap;

src/views/Workshop/product.vue

@@ -32,7 +32,8 @@ const feedbackForm = ref({
 
 
 const onContinue = ()=>{
-	router.push('uploadFace')
+	const query = router.currentRoute.value.query
+	router.push({ path: 'uploadFace', query: {...query} })
 }
 
 const changeModel = ()=>{
@@ -124,7 +125,6 @@ defineExpose({})
 const { isLoading } = toRefs(data);
 </script>
 <template>
-	<header-title style-type="2" />
 	<div class="product" v-if="!isLoading">
 		<div class="text">
 			<div class="title">
@@ -155,7 +155,6 @@ const { isLoading } = toRefs(data);
 			</div>
 		</div>
 	</div>
-	<footer-navigation is-placeholder v-if="!isLoading"/>
 	<van-dialog v-model:show="vanDialogShow" :show-confirm-button="false" width="52.8rem">
 		<div class="feedback">
 			<div class="feedbackClose" @click="closeFeedback"><SvgIcon name="close" size="40" /></div>
@@ -181,7 +180,6 @@ const { isLoading } = toRefs(data);
 	<div class="loading-container" v-if="isLoading">
 		<GenerateLoading title="Generating Results..." />
 	</div>
-	<footer-navigation is-placeholder/>
 </template>
 <style lang="less" scoped>
 	.product{

src/views/Workshop/selectModel.vue

@@ -57,7 +57,6 @@ defineExpose({})
 const { modelList, selectModel } = toRefs(data);
 </script>
 <template>
-	<header-title style-type="2" />
 	<div class="selectModel">
 		<div class="text">
 			<div class="title">

src/views/Workshop/selectStyle.vue

@@ -44,7 +44,8 @@ const toProduct = ()=>{
 	if(generateStore.style.id != generateStore.style.oldId){
 		generateStore.setIsGenerate(true)
 	}
-	router.push({ path: 'product' })
+	const query = router.currentRoute.value.query
+	router.push({ path: 'product', query: {...query} })
 }
 
 const requestOutfit = ({num,index})=>{
@@ -108,7 +109,6 @@ defineExpose({})
 const { styleList, select } = toRefs(data);
 </script>
 <template>
-	<header-title style-type="2" />
 	<div class="selectStyle">
 		<div class="text">
 			<div class="title">
@@ -126,7 +126,6 @@ const { styleList, select } = toRefs(data);
 		</div>
 	</div>
 	<!-- <div class="footer placeholder"></div> -->
-	<footer-navigation is-placeholder />
 </template>
 <style lang="less" scoped>
 	.header-title {