From dd7de209c5d52931bfd8a0cc5c5eca3786d60d34 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 27 May 2024 18:26:46 +0800 Subject: [PATCH] fix --- src/component/Detail/DesignDetail.vue | 6 ++-- src/component/Detail/DesignDetailEnd.vue | 2 +- src/component/Detail/DesignPrintOperation.vue | 33 ++++++++++-------- .../Detail/DesignPrintOperationMobile.vue | 34 +++++++++---------- src/views/HomeView/HomeView.vue | 1 + 5 files changed, 41 insertions(+), 35 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 280df86a..b765fb6e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -278,6 +278,8 @@ export default defineComponent({ watch:{ designItemDetail:{ handler: async function(newVal,oldVal) { + console.log(newVal); + let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail)) this.ifSubmit = designItemDetail.ifSubmit?designItemDetail.ifSubmit:false if(newVal.clothes.length == 0){ @@ -860,8 +862,8 @@ export default defineComponent({ this.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then( (rv) => { - designItemDetail.currentFullBodyView = rv.currentFullBodyView - designItemDetail.ifSubmit = true + this.designItemDetail.currentFullBodyView = rv.currentFullBodyView + this.designItemDetail.ifSubmit = true this.loadingShow = false // if(this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1] && !this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1].id){ // this.designItemDetail.clothes.split(this.designItemDetail.clothes.legnth-1,1) diff --git a/src/component/Detail/DesignDetailEnd.vue b/src/component/Detail/DesignDetailEnd.vue index e9fc8c32..641f3ad9 100644 --- a/src/component/Detail/DesignDetailEnd.vue +++ b/src/component/Detail/DesignDetailEnd.vue @@ -189,7 +189,7 @@ export default defineComponent({ this.type_ = num this.colorList[this.selectIndex] = this.$parent.selectColor this.overallSingle = this.current?.printObject?.ifSingle == null?false:this.current?.printObject?.ifSingle - this.systemDesignerPercentage = this.current?.printObject?.ifSingle?100:this.current?.printObject?.prints[0].scale?this.current?.printObject?.prints[0].scale*100:100 + this.systemDesignerPercentage = this.current?.printObject?.ifSingle?this.current?.printObject?.prints[0].scale?this.current?.printObject?.prints[0].scale*100:100:100 }, //模型 setSketchImg(v){ diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index a21792d5..7e83351b 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -678,21 +678,24 @@ export default defineComponent({ index = ind } }) - designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView - designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle - designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject - designItemDetail.clothes[index].printObject.prints = this.computeZindex() - designItemDetail.ifSubmit = true - designItemDetail.clothes.forEach((item,i)=>{ - let a - if(item.layersObject[0].imageCategory.indexOf("back") == -1){ - a = item.layersObject[0] - item.layersObject[0] = item.layersObject[1] - item.layersObject[1] = a - } - item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id - item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id - }) + if(this.designItemDetailTS.rv){ + designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView + designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle + designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject + designItemDetail.clothes[index].printObject.prints = this.computeZindex() + designItemDetail.ifSubmit = true + designItemDetail.clothes.forEach((item,i)=>{ + let a + if(item.layersObject[0].imageCategory.indexOf("back") == -1){ + a = item.layersObject[0] + item.layersObject[0] = item.layersObject[1] + item.layersObject[1] = a + } + item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0]?.id + item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1]?.id + }) + } + this.store.commit("setDesignItemDetail", designItemDetail); this.store.commit("setDesignPreviewData", this.designItemDetailTS.data); this.setRevocation(designItemDetail,this.designItemDetailTS.data) diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index e53922ca..bc317549 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -682,24 +682,24 @@ export default defineComponent({ } }) this.designOpenrtion = false - if(!this.designItemDetailTS.rv){ - return + if(this.designItemDetailTS.rv){ + designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView + designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle + designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject + designItemDetail.clothes[index].printObject.prints = this.computeZindex() + designItemDetail.ifSubmit = true + designItemDetail.clothes.forEach((item,i)=>{ + let a + if(item.layersObject[0].imageCategory.indexOf("back") == -1){ + a = item.layersObject[0] + item.layersObject[0] = item.layersObject[1] + item.layersObject[1] = a + } + item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id + item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id + }) } - designItemDetail.currentFullBodyView = this.designItemDetailTS.rv.currentFullBodyView - designItemDetail.clothes[index].printObject.ifSingle = this.overallSingle - designItemDetail.clothes[index].layersObject = this.designItemDetailTS.rv.clothes[index].layersObject - designItemDetail.clothes[index].printObject.prints = this.computeZindex() - designItemDetail.ifSubmit = true - designItemDetail.clothes.forEach((item,i)=>{ - let a - if(item.layersObject[0].imageCategory.indexOf("back") == -1){ - a = item.layersObject[0] - item.layersObject[0] = item.layersObject[1] - item.layersObject[1] = a - } - item.layersObject[0].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[0].id - item.layersObject[1].id = this.store.state.DesignDetailModule.designItemDetail.clothes[i].layersObject[1].id - }) + this.store.commit("setDesignItemDetail", designItemDetail); this.store.commit("setDesignPreviewData", this.designItemDetailTS.data); this.setRevocation(designItemDetail,this.designItemDetailTS.data) diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index 997efe14..f5242c5a 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -564,6 +564,7 @@ export default defineComponent({ this.store.commit("clearAllCollection"); this.store.commit("setAllBoardDataChoose",{}); this.store.commit("clearShowSketchboard",{}); + this.isHaveReviewCollection = false }, //完成设计