修复页面bug

src/component/home/design/collection.vue

@@ -130,12 +130,13 @@ export default defineComponent({
 			let value:any = {
 				projectId:data.selectObject.id,
 			}
+			console.log(str)
 			store.dispatch('getProjectData',str).then((data)=>{
 				if(!data[str])return
 				value[str] = data[str]
-				if(!value[str] || value[str]?.length == 0)return
+				// if(!value[str] || value[str]?.length == 0)return
 				Https.axiosPost(Https.httpUrls.saveModuleContent, value).then((rv)=>{
-					if(rv?.boundingBox)store.commit('setShowSketchboard',rv.boundingBox)
+					if(str == 'sketchBoard')store.commit('setShowSketchboard',rv.boundingBox)
 				})
 			})
 		}

src/component/home/design/collection/SketchboardUpload.vue

@@ -154,8 +154,8 @@
 			</div>
 			<div class="modal_accomplish">
 				<div class="modal_img">
-					<div v-for="item,index in sketchboardList" :key="item" class="modal_imgItem" :class="[driver__.driver?'showEvents':'']" >
-						<img v-lazy="item.imgUrl">
+					<div v-for="item,index in sketchboardList" :key="item.id" class="modal_imgItem" :class="[driver__.driver?'showEvents':'']" >
+						<img v-lazy="item.imgUrl" :key="item.imgUrl">
 						<sketchCategory :disignTypeList="sketchCatecoryList" :generateList="sketchboardList" :isSpread="true" :item="item" :driver__="driver__.driver"></sketchCategory>
 						<!-- 在sketch 和print暂时关闭like -->
 						<!-- <div
@@ -173,7 +173,7 @@
 							</label>
 						</div>
 						<div class="moreBox" @click.stop> 
-							<more level1Type="Sketchboard" :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
+							<more level1Type="Sketchboard" :moreList="['edit','down','enlargement','delete']" :item="item" :list="sketchboardList" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
 						</div>
 					</div>
 				</div>

src/component/home/design/collection/more.vue

@@ -107,7 +107,6 @@ export default defineComponent({
 				originalIdSource:props.item.resData.designType,
 				type:props.level1Type,
 			}
-			console.log(data)
 			Https.axiosPost(Https.httpUrls.modifySketch, data).then(
 				(rv) => {
 					// rv.imgUrl = rv.url

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

@@ -45,7 +45,7 @@
 						v-model:value="productimgSimilarity"
 						:tooltipVisible="false"
 						:step="5"
-						:max="70"
+						:max="100"
 						@afterChange="()=>{}"
 					>
 					</a-slider>
@@ -354,7 +354,8 @@ setup(props:any,{emit}) {
 	}
 	let getPrductimg = async ()=>{
 		let obj = getData()
-		let imageStrength = productimg.productimgSimilarity == 100? 95 :productimg.productimgSimilarity
+		// let imageStrength = productimg.productimgSimilarity == 100? 95 :productimg.productimgSimilarity
+		let imageStrength = 70 / 100 * productimg.productimgSimilarity
 		let data:any ={
 			direction:productimg.productimgRelightDirection,
 			prompt:productimg.productimgSearchName,

src/component/home/design/index.vue

@@ -173,7 +173,7 @@
 														@mouseenter.stop="gifPlay($event,design)"
 														@mouseleave.stop="gifPause($event,design)" >
 													<!-- <div :style="{'background-image': `url(${design?.designOutfitUrl||design?.url})`}" class="content_img" v-if="design?.designOutfitUrl||design?.url" :key="design?.designOutfitUrl" designType="like" :index="index"></div> -->
-													<img class="content_img" v-if="design?.designOutfitUrl||design?.url" :src="design?.designOutfitUrl||design?.url"
+													<img class="content_img" v-else-if="design?.designOutfitUrl||design?.url" :src="design?.designOutfitUrl||design?.url"
 														:key="design?.status" designType="like" :index="index"/>
 													<a-spin v-show="!design?.designOutfitUrl && !design?.url && !design?.firstFrameUrl" size="large"></a-spin>
 
@@ -910,6 +910,7 @@ export default defineComponent({
 		}
 		const addGenerateImg = async (data:any)=>{
 			if(!data.id)return
+			console.log(data)
 			await nextTick().then(()=>{
 				designData.isUnfold = true
 				uploadLikeDom()
@@ -1035,6 +1036,11 @@ export default defineComponent({
 						designData.selectLikeDesign[index].elementType = element.elementType
 						designData.selectLikeDesign[index].elementId = element.elementId
 						designData.selectLikeDesign[index].id = element.id
+						if(element?.videoUrl){
+							designData.selectLikeDesign[index].firstFrameUrl = element.firstFrameUrl
+							designData.selectLikeDesign[index].videoUrl = element.videoUrl
+							designData.selectLikeDesign[index].gifUrl = element.gifUrl
+						}
 					}
 				});	
 			}
@@ -1047,6 +1053,11 @@ export default defineComponent({
 							likeItem.childList[index].elementType = element.elementType
 							likeItem.childList[index].elementId = element.elementId
 							likeItem.childList[index].id = element.id
+							if(element?.videoUrl){
+								likeItem.childList[index].id.firstFrameUrl = element.firstFrameUrl
+								likeItem.childList[index].id.videoUrl = element.videoUrl
+								likeItem.childList[index].id.gifUrl = element.gifUrl
+							}
 						}
 					})
 				}
@@ -1203,9 +1214,9 @@ export default defineComponent({
 				state = false
 				Https.axiosPost(url, data).then(
 					(rv) => {
-						if(type == 'PoseTransfer'){
-							rv = [rv]
-						}
+						// if(type == 'PoseTransfer'){
+						// 	rv = [rv]
+						// }
 						state = true
 						rv.forEach((element:any) => {
 							if(element?.status == 'Success'){

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

@@ -127,6 +127,9 @@ export default defineComponent({
 							data.libraryList = item.modelList
 						}
 					});
+					if(rv.length == 1){
+						data.libraryList = []
+					}
 					if(data.libraryList?.[0]==null)data.systemUser=true
 					if(!data.systemUser){
 						data.modelList = data.libraryList
@@ -396,6 +399,7 @@ export default defineComponent({
 			// max-height: calc(100% - 20rem);
 			height: 100%;
 			position: relative;
+			flex: 1;
 			> .item{
 				width: 25rem;
 				height: 55rem;
@@ -461,9 +465,10 @@ export default defineComponent({
 				position: sticky;
 				flex-shrink: 0;
 				background: #fff;
-				margin: auto 0;
+				// margin: auto 0;
 				> .upload{
-					height: 55rem;
+					height: 100%;
+					// height: 55rem;
 					width: 29rem;
 					border: 1px dashed transparent;
 					background: linear-gradient(#fff, #fff) padding-box, repeating-linear-gradient(-45deg, #fff 0, #fff 0.3em, #000 0, #000 0.6em);

src/component/home/design/tools.vue

@@ -49,7 +49,7 @@
 					:isState="openType =='relight'"	
 					v-if="openType == 'relight'"
 				></toProductRelight>
-				<poseTransfer v-if="openType == 'poseTransfer'" :source="source" :isDesignPage="true" @setLike="designLike" ref="poseTransfer"></poseTransfer>
+				<poseTransfer v-if="openType == 'poseTransfer'" @unLike="unLike" :source="source" :isDesignPage="true" @setLike="designLike" ref="poseTransfer"></poseTransfer>
 				<div v-if="openType == 'editCanvas'" class="canvasBox" :class="{editCanvas:openType == 'editCanvas'}">
 					<div class="canvas" ref="canvasBox">
 						<editCanvas 

src/component/home/index.vue

@@ -52,6 +52,7 @@ export default defineComponent({
 			chatData:null as any,
 			dataLoad:true as any,
 		})
+		console.log(data.selectObject)
 		let settingGetHistory:any = inject('settingGetHistory')
 		const setIsShowMark = (boolean:boolean)=>{
 			data.isShowMark = boolean
@@ -62,6 +63,12 @@ export default defineComponent({
 			newPorject:null as any,
 			chatDom:null as any,
 		})
+		watch(() => data.selectObject.styleId,()=>{
+			if((data.selectObject?.id == route.query?.history) && route.query?.history){
+				getHistory(route.query.history)
+			}
+		})
+			
 		watch(() => route.query,
 			(query:any, oldQuery:any) => {
 				data.routeQuery = query

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

@@ -90,12 +90,15 @@
 				<div v-show="isGenerate && !remGenerate" class="generage_btn started_btn">
 					<i class="fi fi-br-loading"></i>
 				</div>
-				<div v-show="remGenerate" @click="removeGenerate" class="generage_btn started_btn">
+				<div v-show="remGenerate" @click="setRemoveGenerate" class="generage_btn started_btn">
 					{{$t('Generate.Close')}}
 				</div>
 			</div>
 		</div>
 		<div class="likeBox">
+			<!-- {{ locale }}
+			<img src="@/assets/images/homePage/toolsGuide/productCN.png" alt="">
+			<img src="@/assets/images/homePage/toolsGuide/productEN.png" alt=""> -->
 			<div class="element">
 				<div class="title"><i class="fi fi-rs-comments"></i><span>{{$t('poseTransfer.LikeVideo')}}</span></div>
 				<div class="content">
@@ -148,7 +151,7 @@ export default defineComponent({
 	},
 	emit:['unLike'],
 	setup(props,{emit}) {
-		const {t} = useI18n()
+		const {t,locale} = useI18n()
 		const store = useStore();
 		const data:any = reactive({
 			button:{
@@ -302,7 +305,7 @@ export default defineComponent({
 			})
 		}
 		const setGenerate = (dataList:any)=>{
-			let list:any = dataList
+			let list:any = [dataList]
 			data.waitList = list
 			let state = true
 			data.generateTime = setInterval(()=>{
@@ -347,7 +350,7 @@ export default defineComponent({
 				});
 			},10000)
 		}
-		const removeGenerate = ()=>{
+		const setRemoveGenerate = ()=>{
 			//取消操作
 			data.isGenerate = false
 			data.remGenerate = false
@@ -355,7 +358,7 @@ export default defineComponent({
 			if(data.waitList){
 				// let str = data.waitList.map((obj:any) => obj.taskId).join(',');
 				let value = {
-					uniqueId:data.waitList,
+					uniqueId:data.waitList[0],
 					userId:store.state.UserHabit.userDetail.userId,
 					timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
 					type: 'PoseTransferation'
@@ -476,13 +479,18 @@ export default defineComponent({
 				if(props.isDesignPage){
 					emit('unLike',item)
 				}
+				console.log(props.isDesignPage)
 			}
 			Https.axiosPost(Https.httpUrls.poselikeOrDisike, {},{params:value}).then(
 				(rv) => {
 					if(str == 'like'){
 						item.newLike = true
 						let value = {
-							likedList:[item],
+							likedList:[{
+								...item,
+								sort:rv.sort,
+								parentId:rv.parentId,
+							}],
 							str:'add',
 							index:-1,
 						}
@@ -490,7 +498,9 @@ export default defineComponent({
 						data.noLikeList.splice(index,1)
 					}else{
 						let value = {
-							likedList:[item],
+							likedList:[{
+								...item,
+							}],
 							str:'splice',
 							index:index,
 						}
@@ -539,13 +549,11 @@ export default defineComponent({
 		watch(()=>data.noLikeList.length,(newVal,oldVal)=>{
 			nextTick(()=>{
 				let list = store.state.HomeStoreModule.poseTransfer.list
-				let taskIdList = list.filter((item:any)=>!item.videoUrl)
-				console.log(taskIdList)
+				let taskIdList = list.filter((item:any)=>!item.videoUrl)[0]
 				if(taskIdList.length > 0){
 					data.isGenerate = true
 					data.remGenerate = true
-					console.log(taskIdList)
-					setGenerate([taskIdList[0].taskId])
+					setGenerate(taskIdList[0].taskId)
 				}
 			})
 		},{immediate: true })
@@ -569,13 +577,14 @@ export default defineComponent({
 			getUploadUrl,
 			beforeUpload,
 			fileUploadChange,
-			removeGenerate,
+			setRemoveGenerate,
 			likeSetBtn,
 			noLikeSetBtn,
 			selectPose,
 			openSpeed,
 			setSpeed,
 			setUploadDelete,
+			locale,
 		}
 	},
 	directives:{

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

@@ -70,7 +70,7 @@
 							@afterChange="setSimilarity"
 							:tooltipVisible="false"
 							:step="5"
-							:max="70"
+							:max="100"
 						>
 						</a-slider>
 						<input style="margin-left: 2rem;"  type="number" readonly v-model="similarity">
@@ -78,9 +78,10 @@
 					<div v-show="productimgMenu.value == 'Relight'" class="productImg_content_item_title productImg_content_item_title_similarity">
 						<span>{{$t('ProductImg.SelectionFunction')}}</span>
 					</div>
-					<div v-show="productimgMenu.value == 'Relight'" class="productImg_content_item_Direction generalModel_state_item">
+					<!-- 暂时去掉 -->
+					<!-- <div v-show="productimgMenu.value == 'Relight'" class="productImg_content_item_Direction generalModel_state_item">
 						<a-select size="large" style="width: 100%;" v-model:value="speedData.value" :options="speedList" :field-names="{ label: 'relightLabel', value: 'value' }"></a-select>
-					</div>
+					</div> -->
 					<div v-show="productimgMenu.value == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
 						<span>{{$t('ProductImg.RelightDirection')}}</span>
 					</div>
@@ -145,6 +146,7 @@
 
 				
 				<div class="productImg_right">
+					
 					<div class="productImg_right_item_box generalScroll">
 						<div class="content_header_left">
 							<i class="fi fi-rs-comments"></i><span class="content_header_des">
@@ -152,6 +154,14 @@
 							</span>
 						</div>
 						<div class="content">
+							<img 
+								class="guide"
+								v-if="locale == 'ENGLISH' && likeList[productimgMenu.value] == 0 && generateList[productimgMenu.value] == 0" 
+								:src="'/src/assets/images/homePage/toolsGuide/' + (productimgMenu.value == 'ToProductImage'?'productEN':'relightEN') + '.png'" alt="">
+							<img 
+								class="guide"
+								v-else-if="likeList[productimgMenu.value] == 0 && generateList[productimgMenu.value] == 0" 
+								:src="'/src/assets/images/homePage/toolsGuide/' + (productimgMenu.value == 'ToProductImage'?'productCN':'relightCN') + '.png'" alt="">
 							<generalDrag ref="generalDragLeft" :type="productimgMenu.value" :isCopy="!isDesignPage" @setBtn="selectSetBtn" :isDelete="false" :isLike="true" :list="likeList[productimgMenu.value]"></generalDrag>
 						</div>
 						<!-- </div> -->
@@ -243,7 +253,7 @@ export default defineComponent({
 		let userDetail:any= computed(()=>{
 			return store.state.UserHabit.userDetail
 		})
-		const {t} = useI18n()
+		const {t,locale} = useI18n()
 		const upload:any = ref({
 			projectId:computed(()=>store.state.Workspace.probjects.id)
 		})
@@ -563,7 +573,7 @@ export default defineComponent({
 				message.info(t('ProductImg.jsContent2'))
 				return
 			}
-			let imageStrength = productImgData.similarity == 100? 95 :productImgData.similarity
+			let imageStrength = 70 / 100 * productImgData.similarity
 			let data:any ={
 				prompt:productImgData.searchName[props.productimgMenu.value],
 				toProductImageVOList:selectArr,
@@ -644,7 +654,10 @@ export default defineComponent({
 								if(element.status == 'Success'){
 									element.imgUrl = element.url
 									let index = productImgData.generateList[props.productimgMenu.value].findIndex((obj:any) => obj.taskId === element.taskId);
-									productImgData.generateList[props.productimgMenu.value][index] = element
+									productImgData.generateList[props.productimgMenu.value][index] = {
+										...element,
+										modelName:speed.speedData.value,
+									}
 									// productImgData.generateList[props.productimgMenu.value].unshift(element)
 									data = data.filter((item:any) => item !== element.taskId);
 								}else if(element.status == 'Fail'){
@@ -899,6 +912,7 @@ export default defineComponent({
 			ifMaximumLength,
 			openSpeed,
 			setSpeed,
+			locale,
 		};
 	},
 	directives:{
@@ -1285,6 +1299,15 @@ export default defineComponent({
 			position: relative;
 			flex: 1;
 			overflow: hidden;
+			.guide{
+				position: absolute;
+				width: 50rem;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%,-50%);
+				max-height: 100%;
+				object-fit: contain;
+			}
 		}
 		> .btnLeft,> .btnRight{
 			position: absolute;