Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy

src/components/Course/homework.vue

@@ -109,7 +109,7 @@ export default {
          if(res.status==200){
              this.info=res.result;
              //检查是否过期
-            if(res.result.deadTime!=''){
+            if(res.result.deadTime!='' && res.result.deadTime != null){
                var d = new Date(res.result.deadTime);
                var now=new Date();
                if(now.getTime() > d.getTime()){

src/components/VideoPlayer/index.vue

@@ -317,7 +317,7 @@ export default {
     }
 
     setInterval(() => {
-          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
           // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
           if(!this.isDrag){
             var time = localStorage.getItem('videoProgressData')
@@ -364,6 +364,11 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
+      console.log("当前缓存:"+this.videoDom.readyState)
+      if (this.videoDom.readyState < 3){
+        console.log("详细信息",this.videoDom)
+        console.log("卡了",this.videoDom.readyState)
+      }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);

src/views/study/coursenew.vue

@@ -805,7 +805,8 @@
             }else if(h>500){
               h=h+60;
             }
-            $this.controlHeight=h-95;
+            // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })