diff --git a/src/component/Detail/detailLeft/module/currentList.vue b/src/component/Detail/detailLeft/module/currentList.vue index 95143250..09d869cf 100644 --- a/src/component/Detail/detailLeft/module/currentList.vue +++ b/src/component/Detail/detailLeft/module/currentList.vue @@ -5,7 +5,7 @@
- +
@@ -48,6 +48,9 @@ export default defineComponent({ color:computed(()=>store.state.UploadFilesModule.allBoardData.colorBoards), models:computed(()=>store.state.Workspace.probjects.model), }, + sketchCatecoryAllList:computed(()=>{ + return store.state.Workspace.workspaceAllPosition + }), currentDetailType:computed(()=>store.state.DesignDetail.currentDetailType), }) diff --git a/src/component/Detail/model/modelNav.vue b/src/component/Detail/model/modelNav.vue index 355f6b55..5d4e16aa 100644 --- a/src/component/Detail/model/modelNav.vue +++ b/src/component/Detail/model/modelNav.vue @@ -7,7 +7,7 @@ @mousedown.stop="designMousedown(getMousePosition($event,false),item.uniqueId,'disLike')" @touchstart.passive="designMousedown(getMousePosition($event,true),item.uniqueId,'disLike')" @click="selectDetailItem(item,index)"> - + @@ -104,6 +104,17 @@ export default defineComponent({ detailData.designDetail.clothes = detailData.designDetail.clothes.filter((item:any)=>item.id != id) detailData.frontBack_.back = detailData.frontBack_.back.filter((item:any)=>item.id != id) detailData.frontBack_.front = detailData.frontBack_.front.filter((item:any)=>item.id != id) + console.log(detailData.designDetail.clothes) + //判断删除后是否还有服装 + if(detailData.designDetail.clothes.length == 0){ + addSketch() + }else{ + //获取当前最大的priority值 + const maxValue = Math.max(...detailData.designDetail.clothes.map(item => item.priority)); + const maxObj = detailData.designDetail.clothes.find(item => item.priority === maxValue); + store.commit('DesignDetail/setDesignColthes',maxObj.id) + } + emit('deleteItem') } const addSketch = ()=>{ diff --git a/src/component/HomePage/sketchCategory.vue b/src/component/HomePage/sketchCategory.vue index 677fbcd1..6ccde777 100644 --- a/src/component/HomePage/sketchCategory.vue +++ b/src/component/HomePage/sketchCategory.vue @@ -67,6 +67,10 @@ export default defineComponent({ }, generateList:{ type:Array + }, + allCategory:{ + type:Array, + default:[] }, isSetSketchCategory:{ type:Boolean, @@ -117,10 +121,6 @@ export default defineComponent({ file.category = cate.name; if(props.isSetSketchCategory){ setSketchLibrary(props.item) - } - if(props.driver__){ - - driverObj__.moveNext() } // this.store.commit("sketchGenerateFiles", this.fileList); @@ -150,10 +150,14 @@ export default defineComponent({ ).catch((res)=>{ }); } + } + const getCategory = (item)=>{ + } onMounted(()=>{ - if(!props.item.category){ - props.disignTypeList.forEach((item:any) => { + if(!props.item.category || !props.item.categoryValue){ + let arr = props.allCategory || props.catecoryList + arr.forEach((item:any) => { if(item.value == props.item.level2Type){ props.item.category = item.name props.item.categoryValue = item.value diff --git a/src/component/home/design/collection/MoodboardUpload.vue b/src/component/home/design/collection/MoodboardUpload.vue index 93d3ad27..6d0d5e2e 100644 --- a/src/component/home/design/collection/MoodboardUpload.vue +++ b/src/component/home/design/collection/MoodboardUpload.vue @@ -2,12 +2,12 @@
-
- {{ $t('MoodboardUpload.Upload') }} + {{ $t('MoodboardUpload.Generate') }}
- {{ $t('MoodboardUpload.Generate') }} + {{ $t('MoodboardUpload.Upload') }}
-
+
@@ -274,7 +274,6 @@ export default defineComponent({ if(num ==2 ){ let material:any = this.$refs.Material material.init('Moodboard') - }else if (num == 3){ } }, fileUploadChange(data: any) { diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue index 56ab8e8d..6da53643 100644 --- a/src/component/home/design/collection/PrintboardUpload.vue +++ b/src/component/home/design/collection/PrintboardUpload.vue @@ -10,7 +10,7 @@ class="switch_type_item" :class="[openClick == 1 ? 'select_swtich' : '']" > - {{ $t('PrintboardUpload.Upload') }} + {{ $t('PrintboardUpload.Generate') }}
- {{ $t('PrintboardUpload.Generate') }} - + {{ $t('PrintboardUpload.Upload') }}
-
+
@@ -94,7 +93,7 @@ @confirmSelect="confirmSelect" :disignTypeList="printCatecoryList" > - +
@@ -299,11 +298,6 @@ export default defineComponent({ } if(num == 3){ this.scene = this.printCatecoryList[0] - nextTick().then(()=>{ - if(this.driver__.driver){ - driverObj__.moveNext() - } - }) } }, fileUploadChange(data:any){ diff --git a/src/component/home/design/collection/SketchboardUpload.vue b/src/component/home/design/collection/SketchboardUpload.vue index 1640a159..16b4561a 100644 --- a/src/component/home/design/collection/SketchboardUpload.vue +++ b/src/component/home/design/collection/SketchboardUpload.vue @@ -7,7 +7,7 @@ class="switch_type_item" :class="[openClick == 1 ? 'select_swtich' : '']" > - {{ $t('SketchboardUpload.Upload') }} + {{ $t('SketchboardUpload.Generate') }}
- {{ $t('SketchboardUpload.Generate') }} + {{ $t('SketchboardUpload.Upload') }}
-
+
{ - if(this.driver__.driver){ - driverObj__.moveNext() - } - }) } }, scaleImage(index:any){ diff --git a/src/component/home/design/index.vue b/src/component/home/design/index.vue index e011db01..303f1e2d 100644 --- a/src/component/home/design/index.vue +++ b/src/component/home/design/index.vue @@ -1610,6 +1610,12 @@ export default defineComponent({ this.startDesignType = "design"; // this.posiitonData.likeSelectIndex = 0 // this.posiitonData.likeElList = [] + const firstDesign = sessionStorage.getItem('firstDesign'); + + if(!firstDesign && this.likeDesignCollectionList?.length == 0){ + message.info(this.t('HomeView.jsContent13')) + } + sessionStorage.setItem('firstDesign','true'); } this.isShowMark = false; }) diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 87a5bf90..7fd9ee08 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -89,6 +89,9 @@ export default defineComponent({ } nextTick(()=>{ if(query.history || query.id){ + //切换新项目需要清除首次design提示 + sessionStorage.removeItem('firstDesign'); + if(data.openType == 'tools')data.isShowMark = true data.dataLoad = true if(query?.source != 'batch'){ diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 16e98308..a033d85c 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -240,6 +240,7 @@ export default { jsContent10: "二次创作的作品不允许使用'设计'，但是您可以使用'重新设计'", jsContent11: "取消喜欢后相关联的元素会被删除，确认要删除吗", jsContent12: "你确定要删除选中元素和相关元素吗？", + jsContent13: "生成的内容需要点击爱心才会储存到自己的库中", }, ProductImg: { productInput: "请输入关键词（例如款式、材质）", diff --git a/src/lang/en.ts b/src/lang/en.ts index 01b5202e..d843c494 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -240,6 +240,7 @@ export default { jsContent10: "Re-created works are not allowed to use 'design', but you can use 'redesign'", jsContent11: "By unliking this, all connected posts will be deleted. Are you sure you want to continue?", jsContent12: "Are you sure about deleting the current brand DNA?", + jsContent13: "The generated content can only be stored in your library by clicking on the heart icon.", }, ProductImg: { productInput: "Enter keyword(style,texture)",