Przeglądaj źródła

Merge branch 'master' of https://git.cocorobo.cn/jack/PPT

jack 1 dzień temu
rodzic
commit
f404ba2cff
1 zmienionych plików z 5 dodań i 0 usunięć
  1. 5 0
      src/views/Student/index.vue

+ 5 - 0
src/views/Student/index.vue

@@ -465,7 +465,12 @@ const processIframeLinks = async () => {
                 } 
                 else if (iframeSrc.includes('.html')) {
                   hasIframe = true
+<<<<<<< HEAD
                   const html = await api.getHTML(iframeSrc)
+=======
+                  // const html = await api.getHTML(iframeSrc)
+                  const html = await api.getHTML('https://knowledge.cocorobo.cn/zh-CN/story-telling/a7fa08b8-cf60-11ef-93e3-12e77c4cb76b')
+>>>>>>> 998a98633f660d7b7c3d097f0bafea83a3340738
                   console.log('html', html)
                   console.log(`处理幻灯片 ${slideIndex + 1} 中的iframe链接:`, iframeSrc)
                   return {