Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages2/class/detail.vue

@@ -333,11 +333,16 @@ export default {
 			//点击节获取的各层级ID
 			this.moduleId = arr[0];
 			this.chapterId = arr[1];
-			console.log(item, 99);
 		});
 	},
 	methods: {
 		openJY(){
+			uni.authorize({
+			     scope: 'scope.camera',
+			     success() {
+			        
+			     }
+			 })
 			this.$u.toast('此功能正在开发中');
 		},
 		async playVideo(item) {
@@ -396,9 +401,18 @@ export default {
 			var polyvPlayerContext = this.selectComponent('#playerVideo');
 			let noteDate = this.$method.getZeroTime();
 			let noteSecond = polyvPlayerContext.getCurrentTime();
+			console.log(noteSecond,698)
 			if (!noteSecond) {
-				this.$u.toast('视频暂未开始');
-				return;
+				if(noteSecond==0){
+					//播放结束
+					noteSecond = polyvPlayerContext.getDuration();
+					console.log(noteSecond,63398)
+				}
+				if(!noteSecond){
+					this.$u.toast('视频暂未开始');
+					return;
+				}
+				
 			}
 			let data = {
 				gradeId: this.gradeId,
@@ -635,6 +649,12 @@ export default {
 		//拍照
 		openPhoto() {
 			this.photoPopup = true;
+			uni.authorize({
+			     scope: 'scope.camera',
+			     success() {
+			        
+			     }
+			 })
 		},
 		async submit() {
 			const waitYS = await this.imageInfos();