From b8858348c0691ccfd79b2123fe2cc3904a6445f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Wed, 23 Jul 2025 10:42:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=9B=E5=BA=A6=E6=9D=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6208caf4ca065cd930c3c26724e5e0512d29d55d. --- src/components/VideoPlayer/progress-bar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index 2ca784ae..84bc066d 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -73,7 +73,7 @@ export default { }, methods: { down(e) { - if(!this.isDrag) return; + // if(this.isDrag) { this.$emit("getMouseDownStatus", true); this.is_mousedown_progress = true; // 获取完整进度条的clientX(dom左上角) @@ -87,8 +87,8 @@ export default { var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) - // 禁止拖动到未学习区域 - if(time && arr[this.blobId] < current) return; + // 禁止拖动 + if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); // } @@ -124,7 +124,7 @@ export default { // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); - this.$emit("getMouseDownStatus", false); + } }, }, From f91e2f12dddbc27fce9148b8925f40c30c663c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Wed, 23 Jul 2025 10:58:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/progress-bar.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index 84bc066d..ab79c995 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -86,10 +86,9 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) - // 禁止拖动 + console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + // 禁止拖动 true:禁止拖动,false:允许拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; - this.$emit("updateProgress", current); // } @@ -103,7 +102,7 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); @@ -119,12 +118,12 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) this.$emit("getMouseDownStatus", false); // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); - + this.$emit("getMouseDownStatus", false); } }, },