jack преди 16 часа
родител
ревизия
410c944852
променени са 1 файла, в които са добавени 0 реда и са изтрити 4 реда
  1. 0 4
      src/views/Student/index.vue

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

@@ -465,12 +465,8 @@ 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 {