Merge branch 'feature-3.8'

src/components/select-courseware-pop/index.tsx

@@ -24,7 +24,10 @@ export default defineComponent({
       }, 300);
     }
     return () => (
-      <div class={styles.popBox} onClick={(e: Event) => e.stopPropagation()}>
+      <div class={styles.popBox} 
+      onClick={(e: Event) => e.stopPropagation()}
+      onTouchstart={(e: TouchEvent) => e.stopPropagation()}
+      >
         <div class={styles.popBody}>
           <img class={styles.popBg} src={popBox} />
           <img class={styles.popClose} src={popClose} onClick={(e: Event) => {

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/play-item/index.tsx

@@ -140,6 +140,7 @@ export default defineComponent({
 
             <Circle
               class={styles.progress}
+              startPosition="bottom"
               currentRate={(audioData.currentTime / audioData.duration) * 100}
               // currentRate={90}
               strokeWidth={50}

src/views/courseware-play/index.tsx

@@ -293,8 +293,11 @@ export default defineComponent({
         };
       });
       const resourceIndex = data.itemList.findIndex((resource: any) => resource.id === resourceId)
-      handleSwipeChange(resourceIndex)
-      console.log('资源', data.allList, data.itemList, resourceIndex);
+      setTimeout(() => {
+        handleSwipeChange(resourceIndex)
+      }, 0);
+      
+      console.log('资源', data.itemList, resourceIndex);
       setTimeout(() => {
         data.animationState = 'end';
       }, 500);
@@ -450,7 +453,7 @@ export default defineComponent({
       }
     ];
     const handleStop = () => {
-      data.videoItemRef.pause();
+      data.videoItemRef?.pause();
     };
     const acitveTimer = ref();
     // 轮播切换
@@ -851,6 +854,7 @@ export default defineComponent({
 
     // 加载新的章节里的课件
     const loadNewCourseware = async (item: any) => {
+      data.itemList = []
       loadingClass.value = true;
       // activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
       // activeData.lessonCoursewareDetailId = item.lessonCoursewareDetailId;