Merge branch 'feature-3.8'

src/views/courseware-list/component/book/index.tsx

@@ -296,6 +296,9 @@ export default defineComponent({
             })
             if (res?.code == 200 && res.data?.length) {
               // console.log(res.data)
+              res.data.forEach((n: any) => {
+                n.coursewareDetailKnowledgeId = n.coursewareDetailKnowledgeId || item.id
+              })             
               data.coursewareList = res.data;
               // 如果只有一个课件，直接进入该课件
               if (res.data.length == 1) {
@@ -336,19 +339,19 @@ export default defineComponent({
             c_orientation: 0 // 0 横屏 1 竖屏
           }
         });
-        // router.push({
-        //   path: '/courseware-play',
-        //   query: {
-        //     id: item.id,
-        //     subjectId: props.subjectId,
-        //     lessonCoursewareId: item.lessonCoursewareId,
-        //     courseId: props.bookData.id,
-        //     lessonCoursewareDetailId: item.lessonCoursewareDetailId,
-        //     name: item.name,
-        //     tab: props.tab,
-        //     coursewareDetailKnowledgeId: item.coursewareDetailKnowledgeId
-        //   }
-        // });
+        router.push({
+          path: '/courseware-play',
+          query: {
+            id: item.id,
+            subjectId: props.subjectId,
+            lessonCoursewareId: item.lessonCoursewareId,
+            courseId: props.bookData.id,
+            lessonCoursewareDetailId: item.lessonCoursewareDetailId,
+            name: item.name,
+            tab: props.tab,
+            coursewareDetailKnowledgeId: item.coursewareDetailKnowledgeId
+          }
+        });
       }
     };
 

src/views/courseware-play/component/point.module.less

@@ -169,6 +169,8 @@
   .activeItem {
     background: #ECF8FF;
     border-radius: 9px;
+    margin-top: 4px;
+    padding: 8px 12px 2px;
 
     :global {
       .van-cell {

src/views/courseware-play/index.tsx

@@ -251,6 +251,7 @@ export default defineComponent({
           material.materialInfo.forEach((resource: any) => {
             resource.zsdId = material.id // 知识点id
             resource.kjId = item.id // 课件id
+            resource.bizId = route.query.tab == 'course' ? resource.materialId : resource.bizId
             resource.url = resource.type === 'SONG'
             ? 'https://oss.dayaedu.com/ktqy/1698420034679a22d3f7a.png'
             : resource.type === 'PPT'

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7989/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [