Merge branch 'router' of http://gitlab.oytour.com/viitto/pptist into router

src/views/Editor/Thumbnails/index.vue

@@ -459,12 +459,11 @@ const GetTripTemplate = async () =>{
           }
           // 根据集团渲染logo
           if(userInfo.value&&userInfo.value.RB_Group_id<=1){
-            return
             for(let i=0;i<newSlides.length;i++){
               let x = newSlides[i]
               let index =null
               x.elements.forEach((y,indexs)=>{
-                if(y.layerName && y.layerName=='logo') index =  indexs
+                if(y.layerName && y.layerName.indexOf('logo')!=-1) index =  indexs
               })
               let eles = x.elements.filter(y=>y.layerName && y.layerName.indexOf('logo')!=-1)
               let newElements = await ResolveTripLogoHandler(eles,i)
@@ -472,7 +471,6 @@ const GetTripTemplate = async () =>{
               if(index>=0) x.elements.splice(index,1)
             }
           }
-          
           layoutsStore.setLayouts(JSON.parse(JSON.stringify(newSlides)))
           if(searchData.value.sellId&&!searchData.value.TempId) return
           slidesStore.setSlides(newSlides)

src/views/Preview/PreviewCover.vue

@@ -79,9 +79,9 @@ const loadSliders = async ()=>{
           let x = newSlides[i]
           let index =null
           x.elements.forEach((y,indexs)=>{
-            if(y.layerName && y.layerName=='logo') index =  indexs
+            if(y.layerName && y.layerName.indexOf('logo')!=-1) index =  indexs
           })
-          let eles = x.elements.filter(y=>y.layerName && y.layerName=='logo')
+          let eles = x.elements.filter(y=>y.layerName && y.layerName.indexOf('logo')!=-1)
           let newElements = await ResolveTripLogoHandler(eles,i)
           x.elements = x.elements.concat(newElements?.elements)
           if(index>=0) x.elements.splice(index,1)