mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git
synced 2025-12-11 11:56:47 +08:00
Merge branch '250417-bugfix-shl' into test0214
This commit is contained in:
@@ -760,6 +760,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onPlayerPlaying(e){
|
onPlayerPlaying(e){
|
||||||
|
console.log("=======microDetail");
|
||||||
//console.log("当前播放11",itme);
|
//console.log("当前播放11",itme);
|
||||||
this.isAppendTime=false;//禁止追加学习时间
|
this.isAppendTime=false;//禁止追加学习时间
|
||||||
//console.log("当前播放11"+itme);
|
//console.log("当前播放11"+itme);
|
||||||
@@ -798,7 +799,7 @@
|
|||||||
itemId:this.coursewareInfo.studyItemId,
|
itemId:this.coursewareInfo.studyItemId,
|
||||||
videoTime:intTime
|
videoTime:intTime
|
||||||
}
|
}
|
||||||
apiCourseStudy.studyVideoTime(postData).then(rs=>{
|
apiCourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||||
if(rs.status!=200){
|
if(rs.status!=200){
|
||||||
console.log('记录播放时间错误');
|
console.log('记录播放时间错误');
|
||||||
}
|
}
|
||||||
@@ -829,6 +830,7 @@
|
|||||||
//console.log('audioPause');
|
//console.log('audioPause');
|
||||||
},
|
},
|
||||||
audioPlaying(e,second){
|
audioPlaying(e,second){
|
||||||
|
console.log("=======microDetail");
|
||||||
// console.log(e,'e');
|
// console.log(e,'e');
|
||||||
// console.log(e.currentTime,'currentTime');
|
// console.log(e.currentTime,'currentTime');
|
||||||
// console.log(second,'second');
|
// console.log(second,'second');
|
||||||
@@ -869,7 +871,7 @@
|
|||||||
itemId:this.coursewareInfo.studyItemId,
|
itemId:this.coursewareInfo.studyItemId,
|
||||||
videoTime:intTime
|
videoTime:intTime
|
||||||
}
|
}
|
||||||
apiCourseStudy.studyVideoTime(postData).then(rs=>{
|
apiCourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||||
if(rs.status!=200){
|
if(rs.status!=200){
|
||||||
console.log('记录播放时间错误');
|
console.log('记录播放时间错误');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1578,6 +1578,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onPlayerPlaying(e){
|
onPlayerPlaying(e){
|
||||||
|
console.log("=======courseStudy");
|
||||||
if(e.detail.currentTime > 2 && this.trueFalse && this.curContent.status < 9){
|
if(e.detail.currentTime > 2 && this.trueFalse && this.curContent.status < 9){
|
||||||
let params ={
|
let params ={
|
||||||
studyId: this.studyId,//学习id,
|
studyId: this.studyId,//学习id,
|
||||||
@@ -1685,6 +1686,7 @@
|
|||||||
this.stopStudyTime();
|
this.stopStudyTime();
|
||||||
},
|
},
|
||||||
audioPlaying(e,second){
|
audioPlaying(e,second){
|
||||||
|
console.log("=======courseStudy");
|
||||||
this.isAppendTime=true;//打开追加载学习时长
|
this.isAppendTime=true;//打开追加载学习时长
|
||||||
|
|
||||||
let intTime=second;//当前播放时间
|
let intTime=second;//当前播放时间
|
||||||
|
|||||||
@@ -745,6 +745,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onPlayerPlaying(e){
|
onPlayerPlaying(e){
|
||||||
|
console.log("=======在线课");
|
||||||
//console.log("当前播放11",itme);
|
//console.log("当前播放11",itme);
|
||||||
this.isAppendTime=false;//禁止追加学习时间
|
this.isAppendTime=false;//禁止追加学习时间
|
||||||
//console.log("当前播放11"+itme);
|
//console.log("当前播放11"+itme);
|
||||||
@@ -785,7 +786,7 @@
|
|||||||
itemId:this.curContent.studyItemId,
|
itemId:this.curContent.studyItemId,
|
||||||
videoTime:intTime
|
videoTime:intTime
|
||||||
}
|
}
|
||||||
apiCourseStudy.studyVideoTime(postData).then(rs=>{
|
apiCourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||||
if(rs.status!=200){
|
if(rs.status!=200){
|
||||||
console.log('记录播放时间错误');
|
console.log('记录播放时间错误');
|
||||||
}
|
}
|
||||||
@@ -815,6 +816,7 @@
|
|||||||
audioPause(){
|
audioPause(){
|
||||||
},
|
},
|
||||||
audioPlaying(e,second){
|
audioPlaying(e,second){
|
||||||
|
console.log("=======在线课");
|
||||||
this.isAppendTime=false;//禁止追加学习时间
|
this.isAppendTime=false;//禁止追加学习时间
|
||||||
let intTime=second;//当前播放时间
|
let intTime=second;//当前播放时间
|
||||||
let videDuration=e.duration;//音频总时长,秒
|
let videDuration=e.duration;//音频总时长,秒
|
||||||
@@ -852,7 +854,7 @@
|
|||||||
itemId:this.curContent.studyItemId,
|
itemId:this.curContent.studyItemId,
|
||||||
videoTime:intTime
|
videoTime:intTime
|
||||||
}
|
}
|
||||||
apiCourseStudy.studyVideoTime(postData).then(rs=>{
|
apiCourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||||
if(rs.status!=200){
|
if(rs.status!=200){
|
||||||
console.log('记录播放时间错误');
|
console.log('记录播放时间错误');
|
||||||
}
|
}
|
||||||
@@ -1272,7 +1274,11 @@
|
|||||||
word-break:break-all;
|
word-break:break-all;
|
||||||
line-height: 40rpx;
|
line-height: 40rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
-webkit-box-orient: vertical;
|
||||||
|
display: -webkit-box;
|
||||||
|
-webkit-line-clamp: 2;
|
||||||
font-size: 28upx;
|
font-size: 28upx;
|
||||||
// margin-bottom: 20upx;
|
// margin-bottom: 20upx;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user