布局修改 部分bug修复

This commit is contained in:
X1627315083
2025-08-22 10:27:48 +08:00
parent 141821a843
commit 594bf5ce0a
275 changed files with 5675 additions and 13049 deletions

View File

@@ -239,8 +239,8 @@
) in designCollectionList" :key="design?.designItemId" :style="collStyle">
<div class="content_img_flex"
:class="[(driver__.driver && driver__.index == 32)?'hideEvents':'']"
@mousedown.stop="designMousedown(getMousePosition($event,false),design.designItemId || design.id,'disLike')"
@touchstart.passive="designMousedown(getMousePosition($event,true),design.designItemId || design.id,'disLike')"
@mousedown.stop="designMousedown(getMousePosition($event,false),design,'disLike')"
@touchstart.passive="designMousedown(getMousePosition($event,true),design,'disLike')"
@click="
designDetail(
design,
@@ -331,7 +331,7 @@ import { defineComponent, h, ref, computed, toRefs, createVNode,provide,nextTick
import NewCollectionReview from "@/component/HomePage/NewCollectionReview.vue";
import generalCanvas from "@/component/modules/generalCanvas.vue";
import affiche from "@/component/HomePage/affiche.vue";
import DesignDetailcopy from "@/component/DetailCopy/designDetail.vue";
import DesignDetailcopy from "@/component/Detail/designDetail.vue";
import html2canvas from "html2canvas";
import { message,Modal } from "ant-design-vue";
import { useStore } from "vuex";
@@ -371,7 +371,7 @@ export default defineComponent({
},
props:['isState'],
setup(props,{emit}) {
const {t} = useI18n()
const {t,locale} = useI18n()
const store = useStore();
const editDesignType = reactive({
selectProbject:computed(()=>{
@@ -500,10 +500,10 @@ export default defineComponent({
speed.speedData = item
}
const openEditTools = ()=>{
dataDom.designTools.init(speed.speedData.value,likeDesignCollectionList.value)
dataDom.designTools.init(speed.speedData.value,likeDesignCollectionList.value,t,locale)
}
const openCanvas = ()=>{
dataDom.designTools.init('editCanvas')
dataDom.designTools.init('editCanvas','',t,locale)
}
const designData = reactive({
openEditBtnId:-1,
@@ -549,6 +549,7 @@ export default defineComponent({
watch(()=>likeDesignCollectionList.value.length,(val)=>{
if(val>0){
uploadLikeDom()
setPrductimgAll()
}else{
designData.selectLikeDesign = []
@@ -680,9 +681,12 @@ export default defineComponent({
if(design.resultType != 'Design' || designData.isUnfold)return
if(str != 'like' && showDesignMark.value) return
}
let Id = design.userLikeSortId || design.id
let Id = design.userLikeSortId || design.id || design.designItemId
console.log(design)
let arr = str == 'like'? posiitonData.value.likeElList:posiitonData.value.generateElList
console.log(arr)
let item:any = arr.filter((item:any)=>item.userLikeSortId == Id)[0]
console.log(item)
item.el.style.zIndex = 2;
item.el.style.transition = 'all 0s';
let startX = e.clientX,
@@ -897,6 +901,8 @@ export default defineComponent({
clearInterval(prductimgTime.ToProductImage)
clearInterval(prductimgTime.PoseTransfer)
clearInterval(prductimgTime.Relight)
arr[index].sort = arr[index].oldSort || arr[index].sort
console.log(JSON.parse(JSON.stringify(arr[index])))
dataDom.editDesignType.init(arr,index,null,status,listType)
dataDom.editDesignType.isLike = false
// dataDom.editDesignType.productimgRelightDirection = editDesignType.RelightDirection
@@ -966,19 +972,16 @@ export default defineComponent({
}
})
}else{
console.log(design)
likeDesignCollectionList.value.forEach((item:any)=>{
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
item.childList.forEach((childItem:any)=>{
if(childItem.sort > design.oldSort){
console.log(childItem)
childItem.sort -= 1
}
})
item.childList = item.childList.filter((childItem:any)=>{
return childItem.id != design.id
})
console.log(item)
}
})
}
@@ -986,7 +989,6 @@ export default defineComponent({
})
nextTick().then(()=>{
console.log(111)
designData.isUnfold = true
uploadLikeDom()
})
@@ -1025,7 +1027,6 @@ export default defineComponent({
}
const upDataSuccess = (element)=>{
console.log(JSON.parse(JSON.stringify(likeDesignCollectionList.value)))
if(designData.isUnfold){
designData.selectLikeDesign.forEach((item:any,index:any) => {
if(element.taskId == item.taskId){
@@ -1041,13 +1042,11 @@ export default defineComponent({
if(likeItem?.childList?.length > 0){
likeItem.childList.forEach((childItem:any,index:any)=>{
if(childItem.taskId == element.taskId){
console.log(childItem)
likeItem.childList[index].url = element.url
likeItem.childList[index].status = element.status
likeItem.childList[index].elementType = element.elementType
likeItem.childList[index].elementId = element.elementId
likeItem.childList[index].id = element.id
console.log(likeItem.childList)
}
})
}
@@ -1060,7 +1059,6 @@ export default defineComponent({
let list = likeDesignCollectionList.value
if(list[likeIndex].childList.length == 0)return
list[likeIndex].childList.forEach((likeItem:any,index:any)=>{
console.log(likeItem)
if(likeItem.sort >= generateCourseItem.sort){
likeItem.sort += 1
}
@@ -1068,10 +1066,8 @@ export default defineComponent({
}
const generateLoad = async (data:any)=>{
// return
console.log(data)
clearInterval(prductimgTime.ToProductImage)
clearInterval(prductimgTime.PoseTransfer)
clearInterval(prductimgTime.Relight)
console.log(JSON.parse(JSON.stringify(data)))
let list = likeDesignCollectionList.value
//添加元素
if(data.addList){
@@ -1080,6 +1076,7 @@ export default defineComponent({
if(oldData?.resultType == "Design"){
let index = list.findIndex((item:any)=>(item.userLikeSortId == generateCourseItem.parentId && item.resultType == "Design"))
if(!list[index]?.childList)list[index].childList = []
generateCourseItem.oldSort = generateCourseItem.sort
generateCourseItem.sort = list[index]?.childList.length + 1
if(data.status == 'add'){
upDataSort(generateCourseItem,index)
@@ -1095,8 +1092,11 @@ export default defineComponent({
upDataSort(generateCourseItem,index)
list[index]?.childList.push(generateCourseItem)
}else{
let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem.id))
list[index].childList[childIndex] = generateCourseItem
upDataSuccess(generateCourseItem)
// let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem?.oldId || generateCourseItem?.id))
// console.log(childIndex)
// console.log(list[index].childList)
// list[index].childList[childIndex] = generateCourseItem
}
}
}
@@ -1108,13 +1108,11 @@ export default defineComponent({
if(oldData?.resultType == "Design"){
}else{
let index = list.findIndex((item:any)=>(item.userLikeSortId == generateCourseItem.parentId))
console.log(index)
if(index != -1){
if(!list[index]?.childList){
list[index].childList = []
}
let childIndex = list[index].childList.findIndex((item:any)=>(item.id == generateCourseItem.id))
console.log(list[index].childList,list[index].childList[childIndex])
list[index].childList.forEach((childItem)=>{
if(childItem.sort > list[index].childList[childIndex].sort){
childItem.sort -= 1
@@ -1129,25 +1127,34 @@ export default defineComponent({
await nextTick().then(()=>{
designData.isUnfold = true
console.log('111s')
uploadLikeDom()
})
setPrductimgAll()
}
const setPrductimgAll = ()=>{
clearInterval(prductimgTime.ToProductImage)
clearInterval(prductimgTime.PoseTransfer)
clearInterval(prductimgTime.Relight)
let list = likeDesignCollectionList.value
let toProductImage = []
let poseTransfer = []
let relight = []
list.forEach((item:any)=>{
if(!item?.childList)item.childList = []
item.childList.forEach((childItem:any)=>{
console.log(childItem)
if(childItem.resultType == 'PoseTransfer'){
if(!childItem.status && !childItem?.firstFrameUrl){
if((!childItem.status || childItem.status != "Success") && !childItem?.firstFrameUrl){
poseTransfer.push(childItem.taskId)
}
}else if(childItem.resultType == 'ToProductImage'){
if(!childItem.status && (!childItem?.url || !childItem?.designOutfitUrl)){
if((!childItem.status || childItem.status != "Success") && (!childItem?.url)){
toProductImage.push(childItem.taskId)
}
}else if(childItem.resultType == 'Relight'){
if(!childItem.status && (!childItem?.url || !childItem?.designOutfitUrl)){
console.log(JSON.parse(JSON.stringify(childItem)))
console.log((!childItem.status || childItem.status != "Success"), (!childItem?.url))
if((!childItem.status || childItem.status != "Success") && (!childItem?.url)){
relight.push(childItem.taskId)
}
}
@@ -1220,7 +1227,7 @@ export default defineComponent({
clearInterval(prductimgTime[type])
setFail(data)
});
},type == 'PoseTransfer'?20000:3000)
},type == 'PoseTransfer'?10000:3000)
}
const gifPlay = (e:any,item:any)=>{
e.target.src = item.gif || item.gifUrl//使用gif图片
@@ -1248,6 +1255,8 @@ export default defineComponent({
item.oldSort = item.sort
if(item?.childList?.length > 0){
item.childList.forEach((childItem:any,childIndex:number)=>{
childItem.oldSort = childItem.sort
childItem.oldSort = childItem.sort
childItem.sort = childItem.sort + childLength + index
// childItem.sort = childIndex + item.sort + childLength