Merge branch 'iteration-courseware-search' into jenkins-dev

src/views/courseListSearch/child-node.tsx

@@ -4,15 +4,14 @@ import { Cell, Collapse, CollapseItem } from "vant";
 import iconVideo from './image/icon-video.png'
 import iconSong from './image/icon-song.png'
 import iconImage from './image/icon-image.png'
-import { useRouter } from "vue-router";
 
 // 获取对应图片
 export const getImage = (item: any) => {
-  if (item.typeCode === 'VIDEO') {
+  if (item.type === 'VIDEO') {
     return iconVideo;
-  } else if (['IMAGE', 'IMG'].includes(item.typeCode)) {
+  } else if (['IMAGE', 'IMG'].includes(item.type)) {
     return iconImage;
-  } else if (item.typeCode === 'SONG') {
+  } else if (item.type === 'SONG') {
     return iconSong;
   } else {
     return iconVideo;

src/views/coursewarePlay/index.tsx

@@ -422,7 +422,7 @@ export default defineComponent({
                       : [];
                     const materialMusicId =
                       materialRefs.length > 0
-                        ? materialRefs[0].resourceIdStr
+                        ? materialRefs[0].resourceId
                         : null;
                     const useStatus = materialRefs.length > 0
                     ? materialRefs[0]?.extend?.useStatus : null
@@ -448,7 +448,7 @@ export default defineComponent({
                         : [];
                       const materialMusicId =
                         materialRefs.length > 0
-                          ? materialRefs[0].resourceIdStr
+                          ? materialRefs[0].resourceId
                           : null;
                       const useStatus = materialRefs.length > 0
                       ? materialRefs[0]?.extend?.useStatus : null