From b908fbe732b1012843611d5c05aad60f190a212b Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 29 Nov 2023 10:33:13 +0800 Subject: [PATCH] fix --- src/component/HomePage/ExportNewCoolection.vue | 7 ++++--- src/component/HomePage/collectionModal.vue | 3 --- src/store/uploadFile/uploadFile.ts | 5 +++-- src/tool/guide.js | 4 ++-- src/views/HomeView.vue | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/component/HomePage/ExportNewCoolection.vue b/src/component/HomePage/ExportNewCoolection.vue index 35d96a24..caadf0e2 100644 --- a/src/component/HomePage/ExportNewCoolection.vue +++ b/src/component/HomePage/ExportNewCoolection.vue @@ -80,7 +80,8 @@ export default defineComponent({ components:{MoodTemplate}, setup() { let sketch:any = ref([[],[],[]]) - let sketchList = ref([]) + let sketchList:any = computed(()=>{ + return store.state.UploadFilesModule.showSketchboard}) const store = useStore(); let allBoardData:any = computed(()=>{return store.state.UploadFilesModule.allBoardData}) let likeDesignCollectionList : any = computed(()=>{return store.state.HomeStoreModule.likeDesignCollectionList}) @@ -96,9 +97,9 @@ export default defineComponent({ watch: { allBoardData:{ handler(newVal:any,oldVal:any){ - this.sketchList = [] + // this.sketchList = [] // this.sketch = [[],[],[]] - this.sketchList = this.allBoardData.sketchboardFiles + // this.sketchList = this.allBoardData.sketchboardFiles this.setSketch() }, immediate: true diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue index 7694a4dc..0f325edd 100644 --- a/src/component/HomePage/collectionModal.vue +++ b/src/component/HomePage/collectionModal.vue @@ -178,7 +178,6 @@ export default defineComponent({ let sketchList = this.store.state.UploadFilesModule.sketchboard let arr:any = [] sketchList.forEach((item:any) => { - console.log(item); let obj = { designType:item.resData.designType, isPin:item.pin ? 1 : 0, @@ -193,8 +192,6 @@ export default defineComponent({ .then((rv: any) => { this.isShowMark = false this.store.commit('clearAllId') - console.log(rv,data); - this.store.commit('setShowSketchboard',rv) GO.id = 0 this.showCollectionModal =false diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts index 841e4aa1..ac145b4e 100644 --- a/src/store/uploadFile/uploadFile.ts +++ b/src/store/uploadFile/uploadFile.ts @@ -162,10 +162,11 @@ const UploadFilesModule : Module = { state.sketchboard = [...state.sketchboardFiles,...state.sketchGenerateFiles,...state.sketchMaterialFiles] }, setShowSketchboard(state,files){ - console.log(files); - state.showSketchboard = files }, + clearShowSketchboard(state,files){ + state.showSketchboard = [] + }, setPrintboardFile(state,files){ state.printboardFiles = files state.printboard = [...state.printboardFiles,...state.printGenerateFiles,...state.printMaterialFiles] diff --git a/src/tool/guide.js b/src/tool/guide.js index 8fa57228..48254350 100644 --- a/src/tool/guide.js +++ b/src/tool/guide.js @@ -140,12 +140,12 @@ function removeDiv(element){ } } const openGuide = () =>{ - driverObj__.drive(); + // driverObj__.drive(); store = useStore() // driverObj__.moveTo(18); let data = { index:driverIndex__, - driver:true, + // driver:true, } store?.commit("setGuide", data); // driverObj__.moveNext(); diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index da9130b0..f5098684 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -824,6 +824,7 @@ export default defineComponent({ }]:[] }; this.store.commit("setAllBoardDataChoose", collectionData); + this.store.commit("setShowSketchboard", collectionData.sketchboardFiles); this.store.commit( "setDesignCollectionId", data.collection.collectionId