Merge branch '2023-5-18_zhi-shi-dian-tu-pian' into online

src/views/courseList/index.module.less

@@ -170,10 +170,6 @@
       opacity: 1;
       background: linear-gradient(180deg, #D3D3D3 0%, #8F8F8F 100%);
     }
-
-    &.downing {
-      width: 100px;
-    }
   }
 }
 

src/views/courseList/index.tsx

@@ -371,11 +371,11 @@ export default defineComponent({
                                       ]}
                                     >
                                       {item.downloadStatus === 1
-                                        ? `下载中 ${item.progress || 0}%`
+                                        ? `${item.progress || 0}%`
                                         : item.downloadStatus === 2
-                                        ? '下载成功'
+                                        ? '成功'
                                         : item.downloadStatus === 3
-                                        ? '重新下载'
+                                        ? '重试'
                                         : '下载'}
                                     </Button>
                                   )}

src/views/coursewarePlay/component/points.tsx

@@ -46,10 +46,12 @@ export default defineComponent({
     const getImage = (item: any) => {
       if (item.type === 'VIDEO') {
         return props.itemActive == item.id ? iconVideoActive : iconVideo
-      } else if (item.type === 'IMAGE') {
+      } else if (['IMAGE', 'IMG'].includes(item.type)) {
         return props.itemActive == item.id ? iconImageActive : iconImage
       } else if (item.type === 'SONG') {
         return props.itemActive == item.id ? iconSongActive : iconSong
+      } else {
+        return props.itemActive == item.id ? iconVideoActive : iconVideo
       }
     }
     return () => (

src/views/coursewarePlay/index.tsx

@@ -246,7 +246,7 @@ export default defineComponent({
 
       console.log(list, 'list')
 
-      let _firstIndex = list.findIndex((n: any) => n.materialId == route.query.kId)
+      let _firstIndex = list.findIndex((n: any) => n.knowledgePointMaterialRelationId == route.query.kId || n.materialId == route.query.kId)
       _firstIndex = _firstIndex > -1 ? _firstIndex : 0
       const item = list[_firstIndex]