Merge remote-tracking branch 'yx/master-0720-lyc' into master-110

This commit is contained in:
joshen
2025-07-23 11:02:35 +08:00

View File

@@ -73,7 +73,7 @@ export default {
}, },
methods: { methods: {
down(e) { down(e) {
if(!this.isDrag) return; // if(this.isDrag) {
this.$emit("getMouseDownStatus", true); this.$emit("getMouseDownStatus", true);
this.is_mousedown_progress = true; this.is_mousedown_progress = true;
// 获取完整进度条的clientXdom左上角 // 获取完整进度条的clientXdom左上角
@@ -86,10 +86,9 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} 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(time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
// } // }
@@ -103,7 +102,7 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} 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; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
@@ -119,7 +118,7 @@ export default {
if(current<0) current = 0; if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData'); var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {} 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); this.$emit("getMouseDownStatus", false);
// 禁止拖动 // 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;