Merge branch 'feature-3.8' of http://git.dayaedu.com/liushengqiang/classroom-app into feature-3.8

src/views/courseware-play/index.tsx

@@ -127,7 +127,7 @@ export default defineComponent({
           });
           if (res?.code == 200 && Array.isArray(res?.data?.lessonList)) {
             data.courseDetails = res.data.lessonList || [];
-            console.log('🚀 ~ data.details course:', data.courseDetails);
+            // console.log('🚀 ~ data.details course:', data.courseDetails);
           }
         } else {
           const res = await api_lessonCoursewareDetail({
@@ -139,7 +139,7 @@ export default defineComponent({
           }
         }
 
-        console.log(data.courseDetails, 'data.courseDetails');
+        // console.log(data.courseDetails, 'data.courseDetails');
       } catch {
         //
       }
@@ -241,7 +241,7 @@ export default defineComponent({
           );
           data.zsdId = currentCourse?.knowledgeList?.[0].id;
           courseList = currentCourse?.knowledgeList?.[0].materialInfo || [];
-          console.log('课件类型', data.allList);
+          // console.log('课件类型', data.allList);
         }
       }
       // 当前的资源id
@@ -304,7 +304,7 @@ export default defineComponent({
         handleSwipeChange(resourceIndex);
       }, 0);
 
-      console.log('资源', data.itemList, resourceIndex);
+      // console.log('资源', data.itemList, resourceIndex);
       setTimeout(() => {
         data.animationState = 'end';
       }, 500);
@@ -549,6 +549,10 @@ export default defineComponent({
           // localStorage.setItem(lastTimeKey, coursewareDetailKnowledgeId);
           // popupData.chapterOpen = false;
           // loadingClass.value = false;
+          // console.log
+          temporaryData.zjId = coursewareDetailKnowledgeId;
+          temporaryData.dyId = lessonCoursewareDetailId;
+          // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
           checkCourseware({
             ...coursewareItem,
             itemActive: coursewareDetailKnowledgeId
@@ -601,6 +605,9 @@ export default defineComponent({
           // popupData.chapterOpen = false;
           // loadingClass.value = false;
           // console.log('2', coursewareItem, coursewareDetailKnowledgeId);
+          temporaryData.zjId = coursewareDetailKnowledgeId;
+          temporaryData.dyId = lessonCoursewareDetailId;
+          // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
           checkCourseware({
             ...coursewareItem,
             itemActive: coursewareDetailKnowledgeId
@@ -658,6 +665,10 @@ export default defineComponent({
           // popupData.itemPointName = coursewareDetailKnowledgeName;
           // popupData.chapterOpen = false;
           // loadingClass.value = false;
+          temporaryData.zjId = coursewareDetailKnowledgeId;
+          temporaryData.dyId = lessonCoursewareDetailId;
+          // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
+          // console.log(coursewareItem, 'coursewareItem', temporaryData);
           checkCourseware({
             ...coursewareItem,
             itemActive: coursewareDetailKnowledgeId
@@ -691,7 +702,7 @@ export default defineComponent({
           }
         }
 
-        // 判断当前章节下面课程是否有内容，否则往上一个章节走
+        // 判断当前章节下面课程是否有内容，否则往下一个单元走
         if (nextLessonStatus) {
           // loadingClass.value = true;
           // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
@@ -704,6 +715,10 @@ export default defineComponent({
           // popupData.itemPointName = coursewareDetailKnowledgeName;
           // popupData.chapterOpen = false;
           // loadingClass.value = false;
+          temporaryData.zjId = coursewareDetailKnowledgeId;
+          temporaryData.dyId = lessonCoursewareDetailId;
+          // activeData.coursewareDetailKnowledgeId = coursewareDetailKnowledgeId;
+          // console.log(coursewareItem, 'coursewareItem', temporaryData);
           checkCourseware({
             ...coursewareItem,
             itemActive: coursewareDetailKnowledgeId
@@ -845,7 +860,6 @@ export default defineComponent({
         }
 
         if (nextLessonStatus) {
-          console.log(nextLessonStatus, 'nextLessonStatus');
           return true;
         }
       }
@@ -870,12 +884,15 @@ export default defineComponent({
       if (route.query.tab == 'all') {
         activeData.coursewareDetailKnowledgeId =
           item.coursewareDetailKnowledgeId;
+        activeData.lessonCoursewareDetailId = temporaryData.dyId;
         localStorage.setItem(lastTimeKey, item.coursewareDetailKnowledgeId);
       } else {
         activeData.lessonCoursewareDetailId = temporaryData.dyId;
         activeData.coursewareDetailKnowledgeId = temporaryData.zjId;
         localStorage.setItem(lastTimeKey, temporaryData.zjId);
       }
+      // console.log(item, 'item', route.query.tab);
+      // console.log(activeData, temporaryData, 'active');
       popupData.chapterOpen = false;
       showSelectCourseware.value = false;
       data.kjId = item.id;
@@ -906,8 +923,9 @@ export default defineComponent({
           if (res?.code == 200 && res.data?.length) {
             data.coursewareList = res.data;
             // 如果只有一个课件，直接进入该课件
+            // console.log(res.data, 'data');
             if (res.data.length == 1) {
-              loadNewCourseware(res.data[0]);
+              loadNewCourseware({ ...res.data[0] });
             } else {
               // 如果有多个课件，需要选择一个课件进入上课页面
               showSelectCourseware.value = true;

src/views/tempo-practice/index.tsx

@@ -160,6 +160,7 @@ export default defineComponent({
         if (route.query.dataJson) {
           dataJson = JSON.parse(route.query.dataJson as any);
         }
+        console.log(dataJson, 'dataJson');
 
         setting.element = dataJson.element;
         setting.beat = dataJson.beat;