页面调整

src/component/home/tools/poseTransfer/index.vue

@@ -18,12 +18,12 @@
 								<div class="" v-if="item.status == 'uploading'" style="display: flex;align-items: center;">
 									<a-spin size="large" />
 								</div>
-								<img v-show="item.status != 'uploading'" :src="item.designOutfitUrl || item.imgUrl || item.url" alt="">	
-								<div v-show="item.status != 'uploading'" class="btnBox">
+								<img v-show="item.designOutfitUrl || item.imgUrl || item.url" :src="item.designOutfitUrl || item.imgUrl || item.url" alt="">	
+								<div v-show="item.designOutfitUrl || item.imgUrl || item.url" class="btnBox">
 									<div :class="{active:item.isChecked}">
 										<i class="fi fi-br-check"></i>
 									</div>
-									<div @click.stop="setUploadDelete(item,index)">
+									<div @click.stop="setUploadDelete(item,index)" v-if="source != 'design'">
 										<i class="fi fi-rr-trash icon_delete"></i>
 									</div>
 								</div>
@@ -97,7 +97,7 @@
 		</div>
 		<div class="likeBox">
 			<div class="element">
-				<div class="title"><i class="fi fi-rs-comments"></i><span>{{$t('poseTransfer.InputVideo')}}</span></div>
+				<div class="title"><i class="fi fi-rs-comments"></i><span>{{$t('poseTransfer.LikeVideo')}}</span></div>
 				<div class="content">
 					<generalDrag ref="generalDragLeft" :list="likeList" :isLike="true" :isVideo="true" @setBtn="likeSetBtn"></generalDrag>
 				</div>
@@ -142,6 +142,10 @@ export default defineComponent({
 			type:Boolean,
 			default:false,
 		},
+		source:{
+			type:String,
+			default:'',
+		},
 	},
 	emits:[],
 	setup(props,{emit}) {
@@ -253,10 +257,29 @@ export default defineComponent({
 				dataDom.generalDragRight.setItemPosition()
 			},200)
 		}
-		const getgenerate = ()=>{
-			if(!data.selectImg.minioUrl)return
+		const getgenerate = async ()=>{
+			if(!data.selectImg.minioUrl)return message.info(t('ProductImg.jsContent2'))
 			if(data.isGenerate)return
+			await new Promise((res,reject)=>{
+				Modal.confirm({
+					title: t('poseTransfer.jsContent1'),
+					icon: createVNode(ExclamationCircleOutlined),
+					okText: 'Yes',
+					cancelText: 'No',
+					mask:false,
+					centered:true,
+					onOk() {
+						res()
+					},
+					cancel(){
+						reject()
+					}
+				});
+			}).then(()=>{
 
+			}).catch(()=>{
+				return
+			})
 			data.isGenerate = true
 			// data.remGenerateTime = setTimeout(()=>{
 			// },10000)
@@ -265,12 +288,15 @@ export default defineComponent({
 				projectId:store.state.Workspace.probjects.id,
 				productImage:data.selectImg.minioUrl,
 				modelName:speed.speedData.value,
+				isDefaultLike:false,//表示是否生成就like
+				parentId:data.selectImg?.parentId,//parentId 添加在指定父级里面
+				userLikeSortId:null,//是否进行排序
 			}
 			Https.axiosPost(Https.httpUrls.poseTransform,value).then((rv)=>{
 				data.remGenerate = true
-				data.noLikeList.unshift({taskId:rv,parentId:data.selectImg.parentId})
+				data.noLikeList.unshift({taskId:rv.taskId,parentId:data.selectImg.parentId})
 				console.log(data.noLikeList)
-				setGenerate(rv)
+				setGenerate([rv.taskId])
 			}).catch((res:any)=>{
 				data.isGenerate = false
 				clearInterval(data.remGenerateTime)
@@ -285,7 +311,7 @@ export default defineComponent({
 				if(!data.isGenerate || !data.remGenerate)return
 				if(!state)return
 				state = false
-				Https.axiosPost(Https.httpUrls.poseTransformResult,{taskId:list}).then(
+				Https.axiosPost(Https.httpUrls.poseTransformResult,list).then(
 					(rv) => {
 						rv=[rv]
 						state = true
@@ -408,7 +434,14 @@ export default defineComponent({
 		}
 		const noLikeSetBtn = (id:any,str:string)=>{
 			if(str == 'delete'){
-				data.noLikeList = data.noLikeList.filter((v:any) => v.id != id);
+				let value = {
+					id,
+					projectId:store.state.Workspace.probjects.id
+				}
+				Https.axiosGet(Https.httpUrls.generateDeleteResult,{params:value}).then(()=>{
+					let index = data.noLikeList.findIndex((v:any) => v.id == id)
+					data.noLikeList.splice(index,1)
+				})
 			}else{
 				data.noLikeList.forEach((item:any,index:any)=>{
 					if(item.id == id && id){
@@ -496,19 +529,28 @@ export default defineComponent({
 				store.commit('setUploadElement',storeData)
 			})
 		}
+		watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{
+			if(props.isDesignPage)return
+			data.fileList = store.state.HomeStoreModule.uploadElement
+		})
 		watch(()=>store.state.Workspace.probjects.id,(newVal,oldVal)=>{
 			nextTick(()=>{
-				data.fileList = store.state.HomeStoreModule.uploadElement
 				let list = store.state.HomeStoreModule.poseTransfer.list
-				let taskIdList = list.filter((item:any)=>!item.id)
+				let taskIdList = list.filter((item:any)=>!item.videoUrl)
 				if(taskIdList.length > 0){
 					data.isGenerate = true
 					data.remGenerate = true
 					console.log(taskIdList)
-					setGenerate(taskIdList[0].taskId)
+					setGenerate([taskIdList[0].taskId])
 				}
 			})
 		},{immediate: true })
+		onBeforeUnmount(()=>{
+			clearInterval(data.generateTime)
+			clearInterval(data.remGenerateTime)
+			data.isGenerate = false
+			data.remGenerate = false
+		})
 		return{
 			...toRefs(speed),
 			...toRefs(dataDom),
@@ -813,7 +855,7 @@ export default defineComponent({
 		}
 
 		> .designPage{
-			padding-left: 4rem;
+			margin-right: 4rem;
 		}
 		> .noLikeBox{
 			padding-left: 2.3rem;