Prechádzať zdrojové kódy

Merge branch 'master' into stage-4

# Conflicts:
#	pages/course/index.vue
chenxiong 3 rokov pred
rodič
commit
679b394bff
1 zmenil súbory, kde vykonal 10 pridanie a 4 odobranie
  1. 10 4
      pages3/polyv/detail.vue

+ 10 - 4
pages3/polyv/detail.vue

@@ -475,7 +475,9 @@ export default {
 				sectionId: parseInt(self.playSectionId),
 				goodsId: parseInt(self.goodsId),
 				courseId: parseInt(self.courseId),
-				gradeId: parseInt(self.gradeId)}
+				gradeId: parseInt(self.gradeId),
+				chapterId: parseInt(self.chapterId),
+				moduleId: parseInt(self.moduleId)}
 				this.$api.getPhotoLastRecord(data).then(res => {
 					if(res.data.code==200){
 						//清空历史数据
@@ -505,7 +507,9 @@ export default {
 				photoTime: parseInt(currentTime > 0 ? currentTime : 0),
 				gradeId: parseInt(self.gradeId),
 				photoIndex: parseInt(photoIndex),//从0算起
-				photoNum:parseInt(self.photoNum)
+				photoNum:parseInt(self.photoNum),
+				chapterId: parseInt(self.chapterId),
+				moduleId: parseInt(self.moduleId),
 			};
 			console.log('提交接口', data);
 			this.$api.coursePhotoRecord(data).then(res => {
@@ -564,7 +568,7 @@ export default {
 					}
 					if(duration>this.photoList[this.photoList.length-1]){
 						this.photoIndex = this.photoList.length-1 //取最后一个下标
-						console.log("1我的修改了photoIndex")
+						console.log("我的修改了photoIndex")
 						break
 					}
 				}
@@ -760,7 +764,9 @@ export default {
 					gradeId: Number(self.gradeId),
 					goodsId: Number(self.goodsId),
 					sectionId: Number(self.playSectionId),
-					courseId: Number(self.courseId)
+					courseId: Number(self.courseId),
+					chapterId: parseInt(self.chapterId),
+					moduleId: parseInt(self.moduleId)
 				};
 				self.$api.recordLast(data).then(res => {
 					resolve(res.data.data);