mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git
synced 2025-12-07 01:46:44 +08:00
Merge branch 'zcwy_0723_hotforum' into master-0726
# Conflicts: # pages/study/courseStudy.vue
This commit is contained in:
@@ -904,6 +904,7 @@
|
||||
},
|
||||
//更换播放内容
|
||||
changePlayRes(con){
|
||||
this.videoPlayingTime = 0
|
||||
this.scormUrl='';//清空地址
|
||||
this.articleMore=true;
|
||||
this.clearTimeHandle();
|
||||
@@ -1587,28 +1588,28 @@
|
||||
//判断是否完成
|
||||
let completeType=this.curriculumData.completeSetup;
|
||||
let completeSecond=this.curriculumData.second;
|
||||
if(!completeSecond){
|
||||
completeSecond=5;//如果没有就采用默认的时间了
|
||||
}
|
||||
if(completeType>0 && this.curContent.status<9){ //因为1按进度,2按时长都是计算时间,所以这里直接大于0处理
|
||||
if(completeType==1){
|
||||
let finishPercent=this.curriculumData.setupTage;
|
||||
let videDuration=this.curContent.duration;
|
||||
let percent =intTime*100/videDuration;
|
||||
if(percent>=finishPercent){
|
||||
this.finishStudyItem();
|
||||
}
|
||||
}else{
|
||||
if(intTime>=completeSecond){
|
||||
this.finishStudyItem();
|
||||
}
|
||||
if (!completeSecond || completeType == 0) {
|
||||
completeSecond = 5; //如果没有就采用默认的时间了
|
||||
}
|
||||
if (this.curContent.status < 9) { //因为1按进度,2按时长都是计算时间,所以这里直接大于0处理
|
||||
if (completeType == 1) {
|
||||
let finishPercent=this.curriculumData.setupTage;
|
||||
let videDuration=this.curContent.duration;
|
||||
let percent =intTime*100/videDuration;
|
||||
if (percent >= finishPercent) {
|
||||
this.finishStudyItem();
|
||||
}
|
||||
} else {
|
||||
if (intTime >= completeSecond) {
|
||||
this.finishStudyItem();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//以下是每隔10秒存储一下进度
|
||||
let saveTime=Math.floor(intTime%10);
|
||||
//console.log(intTime,saveTime,'aa',this.curContent.studyItemId)
|
||||
console.log('3333:',this.preTime,intTime , saveTime,this.curContent.studyItemId)
|
||||
// console.log(intTime,saveTime,'aa',this.curContent.studyItemId)
|
||||
if(this.preTime!=intTime && saveTime==0 && this.curContent.studyItemId!=''){
|
||||
this.preTime=intTime;
|
||||
this.curContent.lastStudyTime=intTime;
|
||||
|
||||
Reference in New Issue
Block a user