Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/lanecarford_front

src/router/index.ts

@@ -120,7 +120,7 @@ const router = createRouter({
         },
         {
           path: '/workshop/selectStyle',
-          name: 'selectStyle',
+          name: 'SelectStyle',
           component: () => import('../views/Workshop/selectStyle/index.vue'),
           meta: { verify: () => VerifyIDs(2) }
         },

src/stores/modules/generate.ts

@@ -95,28 +95,10 @@ export const useGenerateStore = defineStore({
 		...data,
 	  }
     },
-	clearStyle() {
-		this.style = {
-			id: '',
-			path: '',
-			isLike: false,
-			taskId:'',
-			status: ''
-		}
-		this.styleList = [
-			{id:'',taskId:'',status:'',path:''}, 
-			{id:'',taskId:'',status:'',path:''}, 
-			{id:'',taskId:'',status:'',path:''}, 
-			{id:'',taskId:'',status:'',path:''}, 
-		]
-	},
     //模特相关
     selectModel(data: any) {
       this.model.id = data.id
     },
-    setIsGenerate(isGenerate: boolean) {
-      this.isGenerate = isGenerate
-    },
     clearProductData() {
       this.styleList = [
 		{id:'',taskId:'',status:'',path:''}, 
@@ -134,12 +116,14 @@ export const useGenerateStore = defineStore({
       this.model = {
         id: ''
       }
+	  this.clearTryOn()
+    },
+	clearTryOn() {
       this.originalTryOn = {
         id: '',
         isLike: false,
         tryOnUrl: ''
       }
-      this.isGenerate = false
     },
     /** 更新顾客照片信息 */
     updatePhotoInfo(data: any) {

src/views/Workshop/customize.vue

@@ -115,6 +115,7 @@
 	}
 	// 选择另一个穿搭
 	const onChooseOutfit = () => {
+		generateStore.clearTryOn()
 		router.push({ name: 'SelectStyle' })
 	}
 </script>

src/views/Workshop/product.vue

@@ -166,7 +166,7 @@ const { isLoading } = toRefs(data);
 						</template>
 					</gradientButton>
 				</div>
-				<div class="btnItem style2" @click.stop="onContinue">Continue</div>
+				<div class="btnItem style2" @click.stop="onContinue">{{ isHistoryFlow?'Finish':'Continue' }}</div>
 			</div>
 		</div>
 	</div>

src/views/Workshop/selectStyle/index.vue

@@ -75,7 +75,7 @@ const toProduct = ()=>{
 const requestOutfit = async ({num})=>{
 	let rv:any = await new Promise<void>((resolve, reject) => {
 		if(isHistoryFlow.value){
-			retrieveAndRegenerate({tryOnEffectsId:hGenerateStore.originalTryOn.id}).then((rv:any)=>{
+			retrieveAndRegenerate({tryOnEffectsId:hGenerateStore.originalTryOn.id,checkInId:generateStore.visitRecordId}).then((rv:any)=>{
 				resolve(rv)
 			})
 		}else{
@@ -93,7 +93,7 @@ const requestOutfit = async ({num})=>{
 		}
 	})
 	isLoading.value = true
-	generateStore.clearStyle()
+	generateStore.clearProductData()
 	data.select.taskId = rv[0]
 	rv.forEach((item,index)=>data.styleList[index].taskId = item)
 	getRequestOutfitList(rv)
@@ -204,7 +204,7 @@ const { styleListVue } = toRefs(dataDom);
 					</template>
 				</gradientButton>
 			</div>
-			<div class="btnItem style2" @click.stop="toProduct">Continue</div>
+			<div class="btnItem style2" @click.stop="toProduct">{{ isHistoryFlow?'Finish':'Continue' }}</div>
 		</div>
 	</div>
 	<!-- <div class="footer placeholder"></div> -->