Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

dev-dist/sw.js

@@ -82,7 +82,11 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
+<<<<<<< HEAD
     "revision": "0.3rkub68fa8"
+=======
+    "revision": "0.15ep1dnlqh"
+>>>>>>> d3a0451dfca4987c04f7dd71674fa3dfaebcb710
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

index.html

@@ -16,7 +16,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <!-- 自动将HTTP请求升级成安全的HTTPS请求 -->
-  <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
+  <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" /> -->
   <!-- 设置苹果工具栏颜色 -->
   <meta name="apple-mobile-web-app-status-bar-style" content="black" />
   <!-- 忽略页面中的数字识别为电话，忽略email识别 -->

public/version.json

@@ -1 +1,5 @@
-{"version":1734665217158}
+<<<<<<< HEAD
+{"version":1734665217158}
+=======
+{"version":1734591189824}
+>>>>>>> d3a0451dfca4987c04f7dd71674fa3dfaebcb710

src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -609,6 +609,13 @@ export default defineComponent({
               pptCourseware.pptCoursewareShow = false;
               getCoursewareList();
               eventGlobal.emit('openCoursewareChanged');
+              const { teacherSaveFlag, id, chapterKnowledgeList } = res.data;
+              handleRouterPPT({
+                teacherSaveFlag,
+                id,
+                pptId:
+                  chapterKnowledgeList[0]?.chapterKnowledgeMaterialList[0]?.id
+              });
             }
           });
         }