fix: 课件bug修复

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

@@ -340,19 +340,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.zjName,
-        //     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.zjName,
+            tab: props.tab,
+            coursewareDetailKnowledgeId: item.coursewareDetailKnowledgeId
+          }
+        });
       }
     };
 

src/views/courseware-play/component/instrument-info/index.module.less

@@ -28,7 +28,11 @@
       flex-direction: column;
       align-items: center;
       border-bottom: 1px solid #F2F2F2;
-
+      :global {
+        .van-notice-bar {
+            padding: 0;
+        }
+      }  
       >img {
         width: 74px;
         height: 74px;
@@ -105,16 +109,26 @@
       }
 
       .songName {
+        margin-top: 4px;
         font-size: 16px;
         color: #131415;
         font-weight: 500;
-        margin: 12px 0 4px;
+        width: 100%;
+        :global {
+            .van-notice-bar__wrap {
+                padding: 0;
+                justify-content: center;
+            }
+        }
       }
 
       .songWords {
+        width: 100%;
         font-size: 12px;
         color: #777777;
-
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         >span {
           margin-right: 16px;
         }

src/views/courseware-play/component/theory/index.module.less

@@ -9,5 +9,16 @@
         border-radius: 8px;
         background: #fff;
         overflow-y: scroll;
+        &::-webkit-scrollbar
+        {
+            width:4px;
+            height:4px;
+            background-color: transparent;
+        }
+        &::-webkit-scrollbar-thumb
+        {
+            border-radius:10px;
+            background-color:#CBCBCB;
+        }         
     }
 }

src/views/courseware-play/index.tsx

@@ -53,7 +53,6 @@ import Theory from './component/theory';
 import InstrumentInfo from './component/instrument-info';
 import TempoPractice from '../../views/tempo-practice';
 import SelectCoursewarePop from '@/components/select-courseware-pop';
-import { activedNode } from 'element/element.model';
 
 export default defineComponent({
   name: 'CoursewarePlay',
@@ -240,8 +239,11 @@ export default defineComponent({
           console.log('课件类型', data.allList);
         }
       }
+      // 当前的资源id
+      let resourceId: any = null;
       // 课程
       if (courseList.length > 0) {
+        resourceId = courseList[0].id
         data.knowledgePointList = courseList.map((item: any) => {
           return {
             ...item,
@@ -290,7 +292,9 @@ export default defineComponent({
           isRender: false // 是否渲染了
         };
       });
-      // console.log('资源', data.allList, data.itemList);
+      const resourceIndex = data.itemList.findIndex((resource: any) => resource.id === resourceId)
+      handleSwipeChange(resourceIndex)
+      console.log('资源', data.allList, data.itemList, resourceIndex);
       setTimeout(() => {
         data.animationState = 'end';
       }, 500);
@@ -848,9 +852,12 @@ export default defineComponent({
     // 加载新的章节里的课件
     const loadNewCourseware = async (item: any) => {
       loadingClass.value = true;
-      activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
-      activeData.lessonCoursewareDetailId = item.lessonCoursewareDetailId;
-      localStorage.setItem(lastTimeKey, item.coursewareDetailKnowledgeId);
+      // activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
+      // activeData.lessonCoursewareDetailId = item.lessonCoursewareDetailId;
+      if (route.query.tab == 'all') {
+        activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
+        localStorage.setItem(lastTimeKey, item.coursewareDetailKnowledgeId);
+      }
       popupData.chapterOpen = false;
       showSelectCourseware.value = false;
       data.kjId = item.id;
@@ -1204,6 +1211,8 @@ export default defineComponent({
             active={activeData.lessonCoursewareDetailId as any}
             onHandleSelect={async (item: any) => {
               activeData.lessonCoursewareDetailId = item.tabActive;
+              activeData.coursewareDetailKnowledgeId = item.itemActive;
+              localStorage.setItem(lastTimeKey, item.itemActive);
               popupData.itemPointName = item.itemName;
               checkCourseware(item);
             }}