Merge branch 'feature-3.8'

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

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

src/views/courseware-play/index.tsx

@@ -178,6 +178,11 @@ export default defineComponent({
       timer: null as any,
       item: null as any
     });
+    //  切换单元临时数据
+    const temporaryData = reactive({
+      dyId: '', // 单元id
+      zjId: '', // 章节id
+    });
     const getDetail = async () => {
       data.allList = [];
       let courseList: any[] = [];
@@ -861,6 +866,10 @@ export default defineComponent({
       if (route.query.tab == 'all') {
         activeData.coursewareDetailKnowledgeId = item.coursewareDetailKnowledgeId;
         localStorage.setItem(lastTimeKey, item.coursewareDetailKnowledgeId);
+      } else {
+        activeData.lessonCoursewareDetailId = temporaryData.dyId;
+        activeData.coursewareDetailKnowledgeId = temporaryData.zjId;
+        localStorage.setItem(lastTimeKey, temporaryData.zjId);
       }
       popupData.chapterOpen = false;
       showSelectCourseware.value = false;
@@ -1214,9 +1223,8 @@ export default defineComponent({
             itemActive={activeData.coursewareDetailKnowledgeId as any}
             active={activeData.lessonCoursewareDetailId as any}
             onHandleSelect={async (item: any) => {
-              activeData.lessonCoursewareDetailId = item.tabActive;
-              activeData.coursewareDetailKnowledgeId = item.itemActive;
-              localStorage.setItem(lastTimeKey, item.itemActive);
+              temporaryData.dyId = item.tabActive;
+              temporaryData.zjId = item.itemActive;
               popupData.itemPointName = item.itemName;
               checkCourseware(item);
             }}