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

src/stores/modules/generate.ts

@@ -156,6 +156,11 @@ export const useGenerateStore = defineStore({
       for (const key in data) {
         this.customizeInfo[key] = data[key]
       }
+    },
+	uploadCustomizeInfoDemo(data: object) {
+      for (const key in data) {
+        this.customizeInfoDemo[key] = data[key]
+      }
     },
     clearCustomerInfo() {
       this.customerInfo = {

src/stores/modules/overall.ts

@@ -14,6 +14,6 @@ export const useOverallStore = defineStore({
 	// 全局loading
 	setLoading(data:boolean){
 		this.loading = data
-	}
+	},
   }
 })

src/views/Workshop/home.vue

@@ -26,10 +26,18 @@ const clickSwitchVIPID = ()=>{
 		.then(() => {
 			MyEvent.emit('clear-generate-state')
 			MyEvent.emit('clearAllCache')
-			router.push('/stylist/customer')
+			router.push({ name: 'customer', query: { demo: 1 } })
 		})
 		.catch(() => {})
 }
+const openFlow = (path:string,flowType:string)=>{
+	if(flowType == 'clientId')return clickSwitchVIPID()
+	if(flowType == 'main'){
+		router.push({ name: path })
+	}else{
+		router.push({ name: path, query: { demo: 1 } })
+	}
+}
 
 onMounted(()=>{
 	emit('view-type', 1)
@@ -51,16 +59,16 @@ defineExpose({})
 				Explore
 			</div>
 			<div class="navList">
-				<div class="item" @click="()=>router.push('/stylist/index')">
+				<div class="item" @click="openFlow('index','main')">
 					<img src="@/assets/images/nav1.png" alt="">
 				</div>
-				<div class="item" @click="()=>router.push('/workshop/recommended')">
+				<div class="item" @click="openFlow('recommended','reinventing')">
 					<img src="@/assets/images/nav2.png" alt="">
 				</div>
-				<div class="item" @click="()=>router.push('/stylist/index')">
+				<div class="item" @click="openFlow('index','stylist')">
 					<img src="@/assets/images/nav3.png" alt="">
 				</div>
-				<div class="item" @click="clickSwitchVIPID">
+				<div class="item" @click="openFlow('','clientId')">
 					<img src="@/assets/images/nav4.png" alt="">
 				</div>
 			</div>

src/views/Workshop/product.vue

@@ -167,7 +167,7 @@ const { isLoading } = toRefs(data);
 				<div class="info">Do you have any suggestions<br /> for this outfit? </div>
 			</div>
 			<div class="content" state='2' v-else>
-				<div class="title">Congratulation!</div>
+				<div class="title">Done!</div>
 				<div class="info">Your feedback will be very<br /> helpful to us.</div>
 			</div>
 			<div class="feedbackForm" v-if="feedbackForm.state == 1">

src/views/Workshop/uploadFace1.vue

@@ -51,7 +51,7 @@
 			<button class="sandblasted-blurred" @click="handleUploadFace">
 				<span>Upload Face</span>
 			</button>
-			<button class="sandblasted-blurred" @click="handleFinish"><span>Finish</span></button>
+			<button class="sandblasted-blurred" @click="handleFinish" v-if="!isDemo"><span>Finish</span></button>
 		</div>
 	</div>
 	<footer-navigation is-placeholder />

src/views/stylist/index.vue

@@ -34,7 +34,7 @@
     </div>
 
     <!-- Continue按钮 -->
-    <div class="continue-button" @click="handleContinue">Continue</div>
+    <div class="continue-button" @click="handleContinue" v-if="!$route.query?.demo">Continue</div>
     <van-dialog
       class="video-dialog"
       :show-confirm-button="false"
@@ -101,6 +101,7 @@ const swiperRef = ref<any>(null)
 const showVideo = ref<boolean>(false)
 const videoRef = ref<any>(null)
 
+
 const handleChangeCurrent = (index: number) => {
   currentChoosed.value = stylists.value[index].id
 }