修正冲突

src/views/Editor/Thumbnails/index.vue

@@ -70,6 +70,7 @@ import Draggable from 'vuedraggable'
 import { ElLoading, ElMessageBox } from 'element-plus'
 import FileService from '@/services/FileService'
 import { VIEWPORT_SIZE, VIEWPORT_VER_SIZE } from '@/configs/canvas'
+import { Slide } from '@/types/slides'
 
 const mainStore = useMainStore()
 const slidesStore = useSlidesStore()
@@ -386,7 +387,9 @@ const GetTripTemplate = async () =>{
               }
             })
           })
-          console.log(newSlides,'=======模版数据newSlides')
+          if(ConfigId.value>0){
+            newSlides = newSlides.filter((x:Slide)=>!x.isTripItems)
+          }
           slidesStore.setSlides(newSlides)
           layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides)))
           CoverImgStore.setCoverImg(dataRes.data.data.CoverImg)