Merge branch 'iteration-classroom' into jenkins

public/version.json

@@ -1 +1 @@
-{"version":1710317051683}
+{ "version": 1710317051683 }

src/views/attend-class/index.tsx

@@ -228,14 +228,13 @@ export default defineComponent({
           const childList: any[] = [];
           row.chapterKnowledgeMaterialList.forEach((child: any) => {
             if (!child.removeFlag) {
-              const dataJson = child.dataJson ? JSON.parse(child.dataJson) : {};
               childList.push({
                 id: child.id,
                 materialId: child.bizId,
                 coverImg: child.bizInfo.coverImg,
                 type: child.type,
                 title: child.bizInfo.name,
-                dataJson: dataJson.setting ? dataJson.setting : {},
+                dataJson: child.dataJson,
                 isCollect: !!child.favoriteFlag,
                 isSelected: child.source === 'PLATFORM' ? true : false,
                 content: child.bizInfo.content,

src/views/prepare-lessons/components/lesson-main/courseware/addCourseware.tsx

@@ -142,14 +142,13 @@ export default defineComponent({
           const childList: any[] = [];
           if (Array.isArray(child) && child.length > 0) {
             child.forEach((sub: any) => {
-              const dataJson = sub.dataJson ? JSON.parse(sub.dataJson) : {};
               childList.push({
                 id: sub.id,
                 materialId: sub.bizId,
                 coverImg: sub.bizInfo.coverImg,
                 type: sub.type,
                 title: sub.bizInfo.name,
-                dataJson: dataJson.setting || {},
+                dataJson: sub.dataJson,
                 // isCollect: !!sub.favoriteFlag,
                 isSelected: sub.source === 'PLATFORM' ? true : false,
                 content: sub.bizInfo.content,