Merge branch '250415-bugfix-shl' into test20250220

This commit is contained in:
joshen
2025-04-18 08:59:45 +08:00

View File

@@ -1185,7 +1185,12 @@
let postData = { let postData = {
itemId: this.contentData.studyItemId, itemId: this.contentData.studyItemId,
videoTime: intTime, videoTime: intTime,
type: 0 id: this.appentId,
studyId: this.studyId,
courseId: this.contentData.courseId,
contentId: this.contentData.id,
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
duration: 10
}; };
//console.log('this.courseInfo:',this.contentData) //console.log('this.courseInfo:',this.contentData)
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){ if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1193,14 +1198,16 @@
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) { if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
postData.progressVideo = arr[this.blobId] postData.progressVideo = arr[this.blobId]
postData.contentId = this.contentData.id // postData.contentId = this.contentData.id
postData.courseId = this.contentData.courseId // postData.courseId = this.contentData.courseId
} }
} }
//console.log('记录播放时间') //console.log('记录播放时间')
apiStudy.updateStudyVideoTime(postData).then(rs => { apiStudy.updateStudyVideoTime(postData).then(rs => {
if (rs.status != 200) { if (rs.status != 200) {
console.log('记录播放时间错误'); console.log('记录播放时间错误');
}else{
studyUtil.clearStudyDuration(); //清除本地存储
} }
}); });
} }
@@ -1237,7 +1244,13 @@
this.contentData.lastStudyTime = intTime; this.contentData.lastStudyTime = intTime;
let postData = { let postData = {
itemId: this.contentData.studyItemId, itemId: this.contentData.studyItemId,
videoTime: intTime videoTime: intTime,
id: this.appentId,
studyId: this.studyId,
courseId: this.contentData.courseId,
contentId: this.contentData.id,
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
duration: 10
}; };
//console.log('this.courseInfo:',this.contentData) //console.log('this.courseInfo:',this.contentData)
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){ if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
@@ -1245,14 +1258,16 @@
var arr = time&&JSON.parse(time) || {} var arr = time&&JSON.parse(time) || {}
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) { if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
postData.progressVideo = arr[this.blobId] postData.progressVideo = arr[this.blobId]
postData.contentId = this.contentData.id // postData.contentId = this.contentData.id
postData.courseId = this.contentData.courseId // postData.courseId = this.contentData.courseId
} }
} }
//console.log('记录播放时间') //console.log('记录播放时间')
apiStudy.studyVideoTime(postData).then(rs => { apiStudy.updateStudyVideoTime(postData).then(rs => {
if (rs.status != 200) { if (rs.status != 200) {
console.log('记录播放时间错误'); console.log('记录播放时间错误');
}else{
studyUtil.clearStudyDuration(); //清除本地存储
} }
}); });
} }
@@ -1527,23 +1542,23 @@
console.log(rs.message); console.log(rs.message);
} }
}); });
let postAppendData = { // let postAppendData = {
id: this.appentId, // id: this.appentId,
studyId: this.studyId, // studyId: this.studyId,
courseId: this.courseInfo.id, // courseId: this.courseInfo.id,
contentId: this.contentData.id, // contentId: this.contentData.id,
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName, // studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
duration: duration, // duration: duration,
type: 1 // type: 1
}; // };
apiStudy.updateStudyVideoTime(postAppendData).then(rs => { // apiStudy.updateStudyVideoTime(postAppendData).then(rs => {
if (rs.status == 200) { // if (rs.status == 200) {
this.appentId = rs.result; // this.appentId = rs.result;
studyUtil.clearStudyDuration(); //清除本地存储 // studyUtil.clearStudyDuration(); //清除本地存储
} else { // } else {
console.log(rs.message); // console.log(rs.message);
} // }
}); // });
} }
}, },
//结束追加学习时长 //结束追加学习时长