Merge remote-tracking branch 'aliyun/250220-pre-126-177-gx' into test20250220

# Conflicts:
#	src/views/portal/case/Index.vue
#	src/views/study/Courses.vue

src/components/VideoPlayer/progress-bar.vue

@@ -92,7 +92,7 @@ export default {
 
         this.$emit("updateProgress", current);
       // }
-      
+
     },
     move(e) {
       if (this.is_mousedown_progress) {
@@ -124,7 +124,7 @@ export default {
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-        
+
       }
     },
   },
@@ -176,4 +176,4 @@ export default {
 .progress-bar:hover .progress-current::after {
   opacity: 1;
 }
-</style>
+</style>

src/views/study/Courses.vue

@@ -254,7 +254,7 @@ export default {
             let localCourseIds=[];//本地在线课程的id集合
             res.result.list.forEach(item=>{
               if(item.courseImage?.startsWith('/upload')){
-                 item.courseImage=$this.fileUrl+item.courseImage.substring(7)
+                 item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
               }
               if(item.source==2){
                 localCourseIds.push(item.id);

src/views/study/coursenew.vue

@@ -755,7 +755,7 @@
         if (this.contentData.status < 2) {
           // this.contentData.status = 2; //进行中
           if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
-            setTimeout(() => {              
+            setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
               }, 2000);
@@ -817,7 +817,7 @@
             //console.log(h,$this.controlHeight,'$this.controlHeight');
         })
 
-        
+
         //console.log('this.contentData11:',this.contentData,this.curriculumData)
         // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
         if(this.contentData.progressVideo ===1){
@@ -1546,7 +1546,7 @@
           }
         }
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },