Merge branch 'iteration-create'

src/views/co-ai/baseIndex.tsx

@@ -61,7 +61,7 @@ export default defineComponent({
       data.loading = true;
       const { musicTagId, ...music } = forms;
       const res = await api_musicSheetCategoriesPage({
-        musicTagId: [musicTagId],
+        musicTagIds: [musicTagId],
         subjectId: state.user.data?.subjectId || '',
         ...music
         // currentGradeNum: forms.currentGradeNum ? forms.currentGradeNum : ''

src/views/co-ai/index.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
       page: 1,
       rows: 999,
       subjectId: state.user.data?.subjectId || '',
-      musicTagId: route.query.musicTagId ? [route.query.musicTagId] : []
+      musicTagIds: route.query.musicTagId ? [route.query.musicTagId] : []
     });
     const musicForms = reactive({
       page: 1,

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

@@ -217,7 +217,8 @@ export default defineComponent({
           content: {
             url,
             orientation: 0,
-            isHideTitle: false
+            isHideTitle: false,
+            c_orientation: 0 // 0 横屏 1 竖屏
           }
         });
         // router.push({

src/views/courseware-list/index.tsx

@@ -146,6 +146,7 @@ export default defineComponent({
         userId: state.user?.data?.id,
         page: forms.page,
         rows: forms.rows,
+        bookVersionId: forms.bookVersionId ? forms.bookVersionId : '',
         currentGradeNum: forms.currentGradeNum ? forms.currentGradeNum : ''
       });
       if (res?.code === 200 && Array.isArray(res?.data?.rows)) {
@@ -164,6 +165,7 @@ export default defineComponent({
       const res = await api_classLessonCoursewarePage({
         // clientType: 'STUDENT',
         // userId: state.user?.data?.id,
+        bookVersionId: forms.bookVersionId ? forms.bookVersionId : '',
         page: forms.page,
         rows: forms.rows
         // currentGradeNum: forms.currentGradeNum ? forms.currentGradeNum : ''

src/views/courseware-play/component/chapter.tsx

@@ -73,6 +73,7 @@ export default defineComponent({
                             }
                             emit('handleSelect', {
                               itemActive: know.id,
+                              itemName: know.name,
                               tabActive: item.id,
                               tabName: item.name
                             });

src/views/courseware-play/index.tsx

@@ -236,6 +236,7 @@ export default defineComponent({
 
     const popupData = reactive({
       open: false,
+
       activeIndex: 0,
       itemActive: '',
       itemName: '',
@@ -581,11 +582,14 @@ export default defineComponent({
             detail={data.courseDetails}
             itemActive={activeData.coursewareDetailKnowledgeId as any}
             active={activeData.lessonCoursewareDetailId as any}
-            onHandleSelect={(item: any) => {
+            onHandleSelect={async (item: any) => {
               console.log(item, 'item');
               activeData.coursewareDetailKnowledgeId = item.itemActive;
               activeData.lessonCoursewareDetailId = item.tabActive;
-              getDetail();
+              await getDetail();
+              popupData.activeIndex = 0;
+              popupData.itemActive = item.itemActive;
+              popupData.itemName = item.itemName;
               popupData.chapterOpen = false;
             }}
           />