diff --git a/src/assets/icons/CCheck.svg b/src/assets/icons/CCheck.svg new file mode 100644 index 00000000..1c25b56c --- /dev/null +++ b/src/assets/icons/CCheck.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/promptEditProductNo.svg b/src/assets/icons/promptEditProductNo.svg new file mode 100644 index 00000000..36951dfb --- /dev/null +++ b/src/assets/icons/promptEditProductNo.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/promptEditProductYes.svg b/src/assets/icons/promptEditProductYes.svg new file mode 100644 index 00000000..daf0070b --- /dev/null +++ b/src/assets/icons/promptEditProductYes.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/editProduct/PromptEditProduct_edited1.png b/src/assets/images/editProduct/PromptEditProduct_edited1.png new file mode 100644 index 00000000..e86b412b Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_edited1.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_edited2.png b/src/assets/images/editProduct/PromptEditProduct_edited2.png new file mode 100644 index 00000000..2f0000a5 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_edited2.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_edited3.png b/src/assets/images/editProduct/PromptEditProduct_edited3.png new file mode 100644 index 00000000..999f89c3 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_edited3.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list1.png b/src/assets/images/editProduct/PromptEditProduct_list1.png new file mode 100644 index 00000000..b938ca1a Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list1.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list10.png b/src/assets/images/editProduct/PromptEditProduct_list10.png new file mode 100644 index 00000000..54393214 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list10.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list11.png b/src/assets/images/editProduct/PromptEditProduct_list11.png new file mode 100644 index 00000000..61d658df Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list11.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list2.png b/src/assets/images/editProduct/PromptEditProduct_list2.png new file mode 100644 index 00000000..b305848e Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list2.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list3.png b/src/assets/images/editProduct/PromptEditProduct_list3.png new file mode 100644 index 00000000..62577bf1 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list3.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list4.png b/src/assets/images/editProduct/PromptEditProduct_list4.png new file mode 100644 index 00000000..dadf1858 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list4.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list5.png b/src/assets/images/editProduct/PromptEditProduct_list5.png new file mode 100644 index 00000000..913c9d49 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list5.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list6.png b/src/assets/images/editProduct/PromptEditProduct_list6.png new file mode 100644 index 00000000..35e03c4f Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list6.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list7.png b/src/assets/images/editProduct/PromptEditProduct_list7.png new file mode 100644 index 00000000..43f62618 Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list7.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list8.png b/src/assets/images/editProduct/PromptEditProduct_list8.png new file mode 100644 index 00000000..ede4506f Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list8.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_list9.png b/src/assets/images/editProduct/PromptEditProduct_list9.png new file mode 100644 index 00000000..0568333e Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_list9.png differ diff --git a/src/assets/images/editProduct/PromptEditProduct_listOriginal.png b/src/assets/images/editProduct/PromptEditProduct_listOriginal.png new file mode 100644 index 00000000..e86b412b Binary files /dev/null and b/src/assets/images/editProduct/PromptEditProduct_listOriginal.png differ diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d54016b6..915aa6a5 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -388,7 +388,7 @@ export default defineComponent({ let data = { designItemId:detailData.designDetail.designItemId, designSingleItemDTOList:clothes, - isPreview:true, + isPreview:str == 'sub'?false:true, // ifSubmit:designItemDetail.isPreview, gender:workspace?.sex, sketchString:'', @@ -462,7 +462,8 @@ export default defineComponent({ const modelOnLoad = ()=>{ if(!detailData.isUndividedLayerWithSinglePrint)return setTimeout(()=>{ - previwe() + let data = getSubmitData('sub') + store.dispatch('DesignDetail/setSubmit',data) }) } const detailEdit = async (str:any)=>{ diff --git a/src/component/Detail/model/modelNav.vue b/src/component/Detail/model/modelNav.vue index c00d4554..0b94e180 100644 --- a/src/component/Detail/model/modelNav.vue +++ b/src/component/Detail/model/modelNav.vue @@ -108,7 +108,6 @@ 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() @@ -118,7 +117,7 @@ export default defineComponent({ const maxObj = detailData.designDetail.clothes.find(item => item.priority === maxValue); store.commit('DesignDetail/setDesignColthes',maxObj.id) } - + emit('canvasReload') emit('deleteItem') } const addSketch = ()=>{ diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index e07d1648..ae3b8246 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -1,1259 +1,2006 @@ - \ No newline at end of file + diff --git a/src/component/home/design/tools.vue b/src/component/home/design/tools.vue index 448a169a..7c77be77 100644 --- a/src/component/home/design/tools.vue +++ b/src/component/home/design/tools.vue @@ -203,7 +203,10 @@ export default defineComponent({ }) } const unLike = (item)=>{ - data.unLikeList.push(item) + const hasSame = data.unLikeList.some((unlikeItem:any)=>unlikeItem?.id === item?.id) + if(!hasSame){ + data.unLikeList.push(item) + } } let cleardata = async ()=>{ let list = [] @@ -220,10 +223,12 @@ export default defineComponent({ const { newLike, ...rest } = item; // 解构赋值移除 newLike return item.oldSort ? { ...rest, sort: item.oldSort } : rest; }); + const addIdSet = new Set(generateCourse.map((item:any)=>item?.id)) + const deleteList = data.unLikeList.filter((item:any)=>!addIdSet.has(item?.id)) let emitData = { status:'add', addList:generateCourse, - deleteList:data.unLikeList, + deleteList, } emit('editToolsSuccess',emitData,'batch') @@ -489,9 +494,6 @@ export default defineComponent({ // .ant-modal-mask{ // position: absolute; // } - .ant-modal-wrap,.ant-modal-mask{ - - } > .ant-modal-root{ > .ant-modal-centered{ > .fullScreen{ diff --git a/src/component/home/tools/poseTransfer/Product.vue b/src/component/home/tools/poseTransfer/Product.vue new file mode 100644 index 00000000..5dcaa159 --- /dev/null +++ b/src/component/home/tools/poseTransfer/Product.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue index f6d4ffd1..eaac8fca 100644 --- a/src/component/home/tools/poseTransfer/index.vue +++ b/src/component/home/tools/poseTransfer/index.vue @@ -31,7 +31,7 @@
-
+
-
+
+