合并画布

src/component/home/design/collection.vue

@@ -51,7 +51,7 @@
 			</div>
 			<div class="collection_page" v-show="isNext">
 				<i v-show="collectionStep > 1" class="fi fi-rr-arrow-small-left" @click="lastStep()"></i>
-				<i v-if="collectionStep < 5" class="fi fi-rr-arrow-small-right Guide_1_8" @click.stop="nextStep()"></i>
+				<i v-if="collectionStep < 4" class="fi fi-rr-arrow-small-right Guide_1_8" @click.stop="nextStep()"></i>
 				<i v-else class="fi fi-rr-check Guide_1_14" @click.stop="cleardata()"></i>
 
 			</div>
@@ -133,6 +133,7 @@ export default defineComponent({
 			store.dispatch('getProjectData',str).then((data)=>{
 				if(!data[str])return
 				value[str] = data[str]
+				if(!value[str] || value[str]?.length == 0)return
 				Https.axiosPost(Https.httpUrls.saveModuleContent, value).then((rv)=>{
 					if(rv.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
 				})
@@ -177,11 +178,17 @@ export default defineComponent({
 		let lastStep = async ()=>{
 			if(data.collectionStep == 3)await getPantongName()
 			data.collectionStep = data.collectionStep - 1
+			if(data.selectObject.type == 'singleProductDesign' && data.collectionStep == 4){
+				data.collectionStep = data.collectionStep - 1
+			}
 			setOpenSetData()
 		}
 		let nextStep = async ()=>{
 			if(data.collectionStep == 3)await getPantongName()
 			data.collectionStep = data.collectionStep + 1
+			if(data.selectObject.type == 'singleProductDesign' && data.collectionStep == 4){
+				data.collectionStep = data.collectionStep + 1
+			}
 			setOpenSetData()
 		}
 		const setOpenSetData = ()=>{

src/component/home/design/editDesignType/index.vue

@@ -589,7 +589,6 @@ methods: {
 
 		}
 		// this.
-		console.log(list[index])
 		this.generateSuccess.userLikeSortId =  list[index].userLikeSortId
 		this.generateSuccess.parentId =  list[index].parentId
 		this.generateSuccess.productimgIsProductimg = !!this.generateSuccess.productimgIsProductimg
@@ -598,7 +597,7 @@ methods: {
 		this.generateSuccess.remPrductimgTime = this.generateSuccess.remPrductimgTime?this.generateSuccess.remPrductimgTime:null
 		this.generateSuccess.prductimgTime = this.generateSuccess.prductimgTime?this.generateSuccess.prductimgTime:null
 		this.scaleImage = true
-		if(this.poseList.length == 0 && list[index].type == 'PoseTransfer'){
+		if(this.poseList.length == 0 && list[index].resultType == 'PoseTransfer'){
 			this.getPoseList()		
 		}
 		// if(status == 'edit'){
@@ -720,7 +719,12 @@ methods: {
 		}
 	},
 	download(){
-		let url = this.scaleImageList[this.scaleImageIndex].url || this.scaleImageList[this.scaleImageIndex]?.designOutfitUrl
+		let url
+		if(this.generateSuccess.resultType == 'PoseTransfer'){
+			url = this.generateSuccess.newData.videoUrl
+		}else{
+			url = this.generateSuccess.newData.designOutfitUrl || this.generateSuccess?.designOutfitUrl
+		}
 		downloadIamge(url)
 	},
 	setScaleImageIndex(index:any){

src/component/home/design/index.vue

@@ -41,7 +41,7 @@
 								</div>
 								<div class="generage_btn_box">
 									<div class="generage_btn started_btn" style="margin-left: 2rem;">
-										<div class="" @click="openEditTools()" style="margin-left: 1rem;">
+										<div class="" @click.stop="openEditTools()" style="margin-left: 1rem;">
 											Tools
 										</div>
 										<div class="icon iconfont icon-xiala" :class="{active:speedState}" @click.stop="openSpeed"></div>

src/component/home/design/tools.vue

@@ -107,6 +107,7 @@ export default defineComponent({
 						}
 					});
 				}
+				console.log(fileList)
 				dataDom[value].openSetData(fileList)
 			})
 		}