Merge branch 'master' of https://gitee.com/lvYeJu/lane-crawford-3

src/views/Workshop/product.vue

@@ -39,33 +39,38 @@ const startGenerate = ()=>{
 		customerId:1 || generateStore.customerId,
 		visitRecordId:1 || generateStore.visitRecordId,
 		styleId:1 || generateStore.style.id,
-		customerPhotoId:null,
-		modelPhotoId:null,
-		prompt:null,
-		originalTryOnId:null,
+		// customerPhotoId:null,
+		// modelPhotoId:null,
+		// prompt:null,
+		// originalTryOnId:null,
 		isRegenerated:0,
 	}
 	generateTryOnEffect(value).then((res:any)=>{
 		data.isLoading = false;
-		generateStore.tryOnId.id = res.id
-		generateStore.tryOnId.isLike = false
+		generateStore.originalTryOn.isLike = false
+		generateStore.originalTryOn.id = res.tryOnId
+		generateStore.originalTryOn.tryOnUrl = res.tryOnUrl
 		generateStore.useStyleGenerate()//生成后需要对选择衣服页面设置不可选中样式
 		generateStore.setIsGenerate(false)
+
+		generateStore.clearCustomizeInfo()
 	}).catch(()=>{
 		data.isLoading = false;
-		router.back()
+		if(generateStore.originalTryOn.id){
+			router.back()
+		}
 	})
 }
 
 const setLike = ()=>{
-	let tryOnId = generateStore.tryOnId.id
-	if(generateStore.tryOnId.isLike){
+	let tryOnId = generateStore.originalTryOn.id
+	if(generateStore.originalTryOn.isLike){
 		cancelTryOnEffectFavorite(tryOnId).then(()=>{
-			generateStore.tryOnId.isLike = false
+			generateStore.originalTryOn.isLike = false
 		})
 	}else{
 		setTryOnEffectFavorite(tryOnId).then(()=>{
-			generateStore.tryOnId.isLike = true
+			generateStore.originalTryOn.isLike = true
 		})
 	}
 }
@@ -98,10 +103,10 @@ const { isLoading } = toRefs(data);
 			<div class="modelBox">
 				<div></div>
 				<div class="model">
-					<img src="@/assets/images/workshop/posture/posture_1.png" />
+					<img :src="generateStore.originalTryOn.tryOnUrl" />
 					<div class="operation">
-						<div><SvgIcon :name="`love_${generateStore.tryOnId.isLike ? '1' : '0'}`" size="35" @click="setLike" /></div>
-						<div><SvgIcon name="reload" size="35" @click="startGenerate"/></div>
+						<div @click="setLike"><SvgIcon :name="`love_${generateStore.originalTryOn.isLike ? '1' : '0'}`" size="35" /></div>
+						<div @click="startGenerate"><SvgIcon name="reload" size="35" /></div>
 						<!-- <div><SvgIcon name="download" size="35" /></div> -->
 					</div>
 				</div>

src/views/Workshop/selectStyle.vue

@@ -54,7 +54,7 @@ const updateStyle = ({item,index})=>{
 
 const toProduct = ()=>{
 	console.log(generateStore.style)
-	if(generateStore.style.id == -1 && !generateStore.style.oldId){
+	if(!generateStore.style.id && !generateStore.style.oldId){
 		showNotify({ message: 'Please select a style.', type:'warning' });
 		return
 	}