更新

src/views/courseware-list/api.ts

@@ -33,17 +33,17 @@ export const api_lessonCoursewareFavoriteRemove = (
   });
 };
 /** 教材详情 */
-export const api_lessonCoursewareDetail = (
-  params: string | number
-): Promise<any> => {
-  return request.get(`/edu-app/lessonCourseware/detail/${params}`);
+export const api_lessonCoursewareDetail = (params: any): Promise<any> => {
+  return request.get(`/edu-app/lessonCourseware/detail/${params.id}`, {
+    params: params
+  });
 };
 
 /** 课程教材详情 */
-export const api_classLessonCoursewareDetail = (
-  params: string | number
-): Promise<any> => {
-  return request.get(`/edu-app/classLessonCourseware/detail/${params}`);
+export const api_classLessonCoursewareDetail = (params: any): Promise<any> => {
+  return request.get(`/edu-app/classLessonCourseware/detail/${params.id}`, {
+    params: params
+  });
 };
 
 /** 版本教材 */

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

@@ -35,6 +35,10 @@ export default defineComponent({
     rect: {
       type: Object as PropType<DOMRect>,
       default: () => ({})
+    },
+    subjectId: {
+      type: [String, Number],
+      default: ''
     }
   },
   emits: ['close'],
@@ -123,8 +127,6 @@ export default defineComponent({
                   showGuide.value = true;
                 }, 1500);
               }, 500);
-
-              
             });
           });
         });
@@ -208,6 +210,7 @@ export default defineComponent({
           lessonCoursewareId: item.lessonCoursewareId,
           lessonCoursewareDetailId: item.lessonCoursewareDetailId,
           name: item.name,
+          subjectId: props.subjectId,
           tab: props.tab // 当前切换的是哪个类型
         });
         const url =
@@ -226,6 +229,7 @@ export default defineComponent({
         //   path: '/courseware-play',
         //   query: {
         //     id: item.id,
+        //     subjectId: props.subjectId,
         //     lessonCoursewareId: item.lessonCoursewareId,
         //     lessonCoursewareDetailId: item.lessonCoursewareDetailId,
         //     name: item.name,

src/views/courseware-list/index.tsx

@@ -276,7 +276,10 @@ export default defineComponent({
     /** 学生端根据教材编号获取关联的单元、章节 */
     const getDetail = async (item: any) => {
       if (data.tab === 'course') {
-        const res = await api_classLessonCoursewareDetail(item.id);
+        const res = await api_classLessonCoursewareDetail({
+          id: item.id,
+          subjectId: forms.subjectId
+        });
         if (res?.code == 200 && Array.isArray(res?.data?.lessonList)) {
           data.details = res.data.lessonList || [];
           data.bookData = res.data;
@@ -296,7 +299,10 @@ export default defineComponent({
           return;
         }
       } else {
-        const res = await api_lessonCoursewareDetail(item.id);
+        const res = await api_lessonCoursewareDetail({
+          id: item.id,
+          subjectId: forms.subjectId
+        });
         if (res?.code == 200 && Array.isArray(res?.data?.lessonList)) {
           data.details = res.data.lessonList || [];
           data.bookData = res.data;
@@ -471,6 +477,7 @@ export default defineComponent({
         <TheBook
           show={data.showBook}
           bookData={data.bookData}
+          subjectId={forms.subjectId}
           tab={data.tab}
           rect={data.book}
           onClose={() => {

src/views/courseware-play/index.tsx

@@ -105,9 +105,10 @@ export default defineComponent({
 
     const getCourseDetail = async () => {
       try {
-        const res = await api_lessonCoursewareDetail(
-          route.query.lessonCoursewareId as any
-        );
+        const res = await api_lessonCoursewareDetail({
+          id: route.query.lessonCoursewareId as any,
+          subjectId: activeData.subjectId
+        });
         if (res?.code == 200 && Array.isArray(res?.data?.lessonList)) {
           data.courseDetails = res.data.lessonList || [];
         }
@@ -127,6 +128,7 @@ export default defineComponent({
     });
     const activeData = reactive({
       isAutoPlay: true, // 是否自动播放
+      subjectId: route.query.subjectId,
       lessonCoursewareId: route.query.lessonCoursewareId,
       lessonCoursewareDetailId: route.query.lessonCoursewareDetailId,
       coursewareDetailKnowledgeId: route.query.id,
@@ -144,6 +146,7 @@ export default defineComponent({
       if (route.query.tab == 'course') {
         const res = await api_classLessonCoursewareQuery({
           coursewareDetailKnowledgeId: activeData.coursewareDetailKnowledgeId,
+          subjectId: activeData.subjectId,
           page: 1,
           rows: -1
         });
@@ -165,7 +168,8 @@ export default defineComponent({
       } else {
         const res = await api_lessonCoursewareKnowledgeDetailDetail({
           lessonCoursewareKnowledgeDetailId:
-            activeData.coursewareDetailKnowledgeId
+            activeData.coursewareDetailKnowledgeId,
+          subjectId: activeData.subjectId
         });
         if (res?.code === 200 && Array.isArray(res.data)) {
           courseList = res.data || [];