修复bug

components/course/courseChapter.vue

@@ -21,7 +21,6 @@
 						<view v-if="isRebuild||itemM.rebuild>0" class="tagRe">待重修</view>
 						<view v-else>
 							<view :class="{tagGreen:itemM.learning == 1,tagRe:itemM.learning == 0 || itemM.rebuild>0}">
-								<!-- 已做完 -->
 								<text v-if="itemM.rebuild > 0">待重测</text>
 								<text v-else-if="itemM.learning == 1">合格</text>
 								<text v-else-if="itemM.learning == 0">不合格</text>

components/course/courseSection.vue

@@ -133,7 +133,6 @@ export default {
 	},
 	methods: {
 		getVideo(){
-			console.log(this.menuItem)
 			if(this.menuItem.sectionType==1||this.menuItem.sectionType==3){
 				//录播
 				if(!this.isBuy){
@@ -164,11 +163,13 @@ export default {
 				this.$store.commit('setPlayVID', {playVID  :this.menuItem.recordingUrl});
 				uni.$emit('levelId', this.levelId)
 				uni.$emit('getSection', this.menuItem)
-				uni.$off('playEnd')
-				uni.$on('playEnd',res => {
-					console.log('playEnd2')
+				console.log(this.menuItem,'menuItem')
+				uni.$off('playend')
+				uni.$on('playend',res => {
+					console.log('playend2')
 					this.$emit('playEnd')
 				})
+				console.log(999)
 			}
 			if(this.menuItem.sectionType==2){
 				//直播
@@ -191,11 +192,13 @@ export default {
 				this.$store.commit('setPlayChannelId', {playChannelId  :this.menuItem.liveUrl});
 				uni.$emit('levelId', this.levelId)
 				uni.$emit('getChannel', this.menuItem)
-				uni.$off('playEnd')
-				uni.$on('playEnd',res => {
-					console.log('playEnd1')
+				console.log(this.menuItem,'menuItem')
+				uni.$off('playend')
+				uni.$on('playend',res => {
+					console.log('playend1')
 					this.$emit('playEnd')
 				})
+				console.log(888)
 
 			}
 			

pages2/bank/questionBank.vue

@@ -1145,7 +1145,7 @@ export default {
 					res.data.data.forEach((item, index) => {
 						if (typeof item.jsonStr == 'string') {
 							item.jsonStr = JSON.parse(item.jsonStr);
-
+							console.log(index)
 							if (item.type == 2) {
 								//多选
 								item.jsonStr.forEach(str => {
@@ -1156,6 +1156,7 @@ export default {
 									arr[i] = '' + a;
 								});
 								item.ans = arr;
+								item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 								return;
 							} else if (item.type == 5) {
 								//简答题
@@ -1168,6 +1169,7 @@ export default {
 									text: '',
 									imageList: []
 								}
+								item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							} else if (item.type == 4) {
 								//案例题
 								console.log(item.jsonStr);
@@ -1177,6 +1179,7 @@ export default {
 								item.jsonStr.forEach((json, index) => {
 									if (json.type == 1) {
 										ansArr[index] = json.answerQuestion;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 2) {
 										json.optionsList.forEach(str => {
 											str.optionsId = '' + str.optionsId;
@@ -1186,8 +1189,10 @@ export default {
 											arr[i] = '' + a;
 										});
 										ansArr[index] = arr;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 3) {
 										ansArr[index] = json.answerQuestion;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 5) {
 										ansArr[index] = {
 											text: json.answerQuestion,
@@ -1197,13 +1202,15 @@ export default {
 											text: '',
 											imageList: []
 										};
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									}
 								});
 
 								item.ans = ansArr;
 								return;
 							}
-
+							console.log(item.analysisContent)
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							item.ans = item.answerQuestion;
 						}
 					});

pages2/bank/questionBankTest.vue

@@ -473,12 +473,14 @@ export default {
 								arr[i] = ''+a;
 							})
 							item.ans = arr;
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							return;
 						} else if(item.type == 5) { //简答题
 							item.ansText = {
 								text: '',
 								imageList: []
 							}
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							
 						} else if(item.type == 4) { //案例题
 							console.log(item.jsonStr)
@@ -488,6 +490,7 @@ export default {
 							item.jsonStr.forEach((json,index) => {
 								if(json.type == 1) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 2) {
 									json.optionsList.forEach(str => {
 										str.optionsId = ''+str.optionsId;
@@ -496,9 +499,11 @@ export default {
 									arr.forEach((a,i) => {
 										arr[i] = ''+a;
 									})
-									ansArr[index] = arr
+									ansArr[index] = arr;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 3) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 5) {
 									ansArr[index] = {
 										text: '',
@@ -508,6 +513,7 @@ export default {
 										text: '',
 										imageList: []
 									}
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								}
 							})
 							
@@ -515,7 +521,7 @@ export default {
 							return;
 							
 						}
-						
+						item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 						item.ans = item.answerQuestion
 					}
 					

pages2/class/questionBank.vue

@@ -1271,6 +1271,7 @@ export default {
 									arr[i] = '' + a;
 								});
 								item.ans = arr;
+								item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 								return;
 							} else if (item.type == 5) {
 								//简答题
@@ -1283,6 +1284,7 @@ export default {
 									text: '',
 									imageList: []
 								}
+								item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							} else if (item.type == 4) {
 								//案例题
 								console.log(item.jsonStr);
@@ -1292,6 +1294,7 @@ export default {
 								item.jsonStr.forEach((json, index) => {
 									if (json.type == 1) {
 										ansArr[index] = json.answerQuestion;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 2) {
 										json.optionsList.forEach(str => {
 											str.optionsId = '' + str.optionsId;
@@ -1301,8 +1304,10 @@ export default {
 											arr[i] = '' + a;
 										});
 										ansArr[index] = arr;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 3) {
 										ansArr[index] = json.answerQuestion;
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									} else if (json.type == 5) {
 										ansArr[index] = {
 											text: '',
@@ -1312,9 +1317,10 @@ export default {
 											text: '',
 											imageList: []
 										};
+										json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 									}
 								});
-
+								item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 								item.ans = ansArr;
 								return;
 							}

pages2/subject/collectBank.vue

@@ -434,6 +434,7 @@ export default {
 								arr[i] = ''+a;
 							})
 							item.ans = arr;
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}
@@ -443,6 +444,7 @@ export default {
 								text: '',
 								imageList: []
 							}
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							
 							if(this.explain) {
 								item.ques = {
@@ -461,6 +463,7 @@ export default {
 							item.jsonStr.forEach((json,index) => {
 								if(json.type == 1) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 2) {
 									json.optionsList.forEach(str => {
 										str.optionsId = ''+str.optionsId;
@@ -470,8 +473,10 @@ export default {
 										arr[i] = ''+a;
 									})
 									ansArr[index] = arr
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 3) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 5) {
 									ansArr[index] = {
 										text: '',
@@ -481,10 +486,12 @@ export default {
 										text: '',
 										imageList: []
 									}
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								}
 							})
 							
 							item.ans = ansArr
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}

pages2/subject/collectTypeBank.vue

@@ -437,13 +437,14 @@ export default {
 							if(this.explain) {
 								item.ques = item.ans;
 							}
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							return;
 						} else if(item.type == 5) {
 							item.ansText = {
 								text: '',
 								imageList: []
 							}
-							
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = {
 									text:item.analysisContent
@@ -461,6 +462,7 @@ export default {
 							item.jsonStr.forEach((json,index) => {
 								if(json.type == 1) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 2) {
 									json.optionsList.forEach(str => {
 										str.optionsId = ''+str.optionsId;
@@ -470,8 +472,10 @@ export default {
 										arr[i] = ''+a;
 									})
 									ansArr[index] = arr
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 3) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 5) {
 									ansArr[index] = {
 										text: '',
@@ -481,10 +485,12 @@ export default {
 										text: '',
 										imageList: []
 									}
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								}
 							})
 							
 							item.ans = ansArr
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}

pages2/subject/wrongBank.vue

@@ -72,7 +72,7 @@
 						<view v-if="bank.ques">
 							<view class="pad_8 answer">
 								<view>正确答案：
-									<text v-for="ansItem in bank.ans">{{ast[ansItem-1]}}</text>
+									<text :key="ansIndex" v-for="(ansItem,ansIndex) in bank.ans">{{ast[ansItem-1]}}</text>
 								</view>
 								<view v-if="!explain">我的答案：
 									<text v-for="quesItem in bank.ques">{{ast[quesItem-1]}}</text>
@@ -146,7 +146,7 @@
 									<view class="answerTitle">我的答案:</view>
 									{{bank.ques.text}}
 									<view class="imgs">
-										<image class="img" v-for="ques in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
+										<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques.imageList" :src="$method.splitImgHost(ques,true)"></image>
 									</view>
 								</view>
 							</view>
@@ -235,10 +235,10 @@
 								<view v-if="bank.ques[ansIndex]">
 									<view class="pad_8 answer">
 										<view>正确答案：
-											<text v-for="ansItem1 in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
+											<text :key="ansItemIndex1" v-for="(ansItem1,ansItemIndex1) in bank.ans[ansIndex]">{{ast[ansItem1-1]}}</text>
 										</view>
 										<view v-if="!explain">我的答案：
-											<text v-for="quesItem in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
+											<text :key="quesItemIndex" v-for="(quesItem,quesItemIndex) in bank.ques[ansIndex]">{{ast[quesItem-1]}}</text>
 										</view>
 									</view>
 									<view class="pad_8 answerInfos">
@@ -308,7 +308,7 @@
 												<textarea v-model="ansItem.ansText.text" placeholder="在此输入答案"></textarea>
 											</view>
 											<view class="imgs">
-												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" >
+												<view class="img" v-for="(img,imgIndex) in ansItem.ansText.imageList" :key="imgIndex">
 													<text @click="deleteImgChild(imgIndex,bankIndex,ansIndex)">x</text>
 													<image :src="$method.splitImgHost(img, true)"></image>
 												</view>
@@ -318,7 +318,7 @@
 											<view class="answerTitle">我的答案</view>
 											{{bank.ques[ansIndex].text}}
 											<view class="imgs">
-												<image class="img" v-for="ques in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
+												<image class="img" :key="quesIndex" v-for="(ques,quesIndex) in bank.ques[ansIndex].imageList" :src="$method.splitImgHost(ques,true)"></image>
 											</view>
 										</view>
 									</view>
@@ -449,13 +449,14 @@ export default {
 							if(this.explain) {
 								item.ques = item.ans;
 							}
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							return;
 						} else if(item.type == 5) {
 							item.ansText = {
 								text: '',
 								imageList: []
 							}
-							
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = {
 									text:item.analysisContent
@@ -473,6 +474,7 @@ export default {
 							item.jsonStr.forEach((json,index) => {
 								if(json.type == 1) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 2) {
 									json.optionsList.forEach(str => {
 										str.optionsId = ''+str.optionsId;
@@ -482,8 +484,10 @@ export default {
 										arr[i] = ''+a;
 									})
 									ansArr[index] = arr
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 3) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 5) {
 									ansArr[index] = {
 										text: '',
@@ -493,10 +497,12 @@ export default {
 										text: '',
 										imageList: []
 									}
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								}
 							})
 							
 							item.ans = ansArr
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}
@@ -541,6 +547,7 @@ export default {
 								arr[i] = ''+a;
 							})
 							item.ans = arr;
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}
@@ -550,7 +557,7 @@ export default {
 								text: '',
 								imageList: []
 							}
-							
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = {
 									text:item.analysisContent
@@ -592,6 +599,7 @@ export default {
 							})
 							
 							item.ans = ansArr
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}

pages2/subject/wrongTypeBank.vue

@@ -430,13 +430,14 @@ export default {
 							if(this.explain) {
 								item.ques = item.ans;
 							}
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							return;
 						} else if(item.type == 5) {
 							item.ansText = {
 								text: '',
 								imageList: []
 							}
-							
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = {
 									text:item.analysisContent
@@ -454,6 +455,7 @@ export default {
 							item.jsonStr.forEach((json,index) => {
 								if(json.type == 1) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 2) {
 									json.optionsList.forEach(str => {
 										str.optionsId = ''+str.optionsId;
@@ -463,8 +465,10 @@ export default {
 										arr[i] = ''+a;
 									})
 									ansArr[index] = arr
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 3) {
 									ansArr[index] = json.answerQuestion;
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								} else if(json.type == 5) {
 									ansArr[index] = {
 										text: '',
@@ -474,10 +478,12 @@ export default {
 										text: '',
 										imageList: []
 									}
+									json.content && (json.content = json.content.replace(/<img/gi, '<img style="max-width:100%;"'));
 								}
 							})
 							
 							item.ans = ansArr
+							item.analysisContent && (item.analysisContent = item.analysisContent.replace(/<img/gi, '<img style="max-width:100%;"'));
 							if(this.explain) {
 								item.ques = item.ans;
 							}

pages3/course/detail.vue

@@ -39,12 +39,12 @@
 			</view>
 			
 		</view>
-		<view style="padding: 20rpx;position: relative;top: 680rpx;" v-show="current==0">
+		<view style="padding: 20rpx;position: relative;top: 730rpx;" v-show="current==0">
 			<view class="content">
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
 			</view>
 		</view>
-		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 680rpx;" v-show="current==1">
+		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 730rpx;" v-show="current==1">
 			<view >
 				<view v-for="(item,index) in courseList" :key="index" >
 					<view class="courseItemBox" >

pages3/polyv/detail.vue

@@ -64,7 +64,7 @@
 			</view>
 			<!--讲义 -->
 			<view v-show="current == 1">
-				<view class="lecture-box">
+				<view class="lecture-box" v-if="courseHandoutsData">
 					<view class="title">
 						{{courseHandoutsData.handoutsName}}
 						<!-- 这是后台配置的讲义标题过长省略这是后台配置的讲义标题过长省略 -->
@@ -73,6 +73,8 @@
 						<u-icon name="download" color="#007AFF" size="40"></u-icon>
 					</view>
 				</view>
+				
+				<view style="text-align: center;" v-else>暂无讲义</view>
 				<!-- <view class="lecture-content">
 					<rich-text :nodes="'讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容'"></rich-text>
 				</view> -->
@@ -224,7 +226,7 @@ export default {
 				isAutoChange: false,
 				forceVideo: false, 
 			},
-			courseHandoutsData:{},
+			courseHandoutsData:'',
 			liveDetail:{},
 			showSet:false,
 			startStatus: false,
@@ -534,7 +536,7 @@ export default {
 				currentTime = polyvPlayerContext.getCurrentTime();
 			}
 			let self = this;
-			let photoIndex = self.photoIndex
+			let photoIndex = self.photoIndex-1
 			let data = {
 				photo: self.ossAvatarUrl,
 				sectionId: parseInt(self.playSectionId),
@@ -971,6 +973,7 @@ export default {
 			this.postAnswer();
 		},
 		postStudyRecord(status = 0, sectionId = this.playSectionId) {
+			console.log('status',status)
 			let currentTime = 0;
 			let PlayDuration = 0
 			var polyvPlayerContext = this.selectComponent('#playerVideo');
@@ -999,7 +1002,7 @@ export default {
 			console.log('提交接口', data);
 			this.$api.studyRecord(data).then(res => {
 				if (status > 0) {
-					uni.$emit('playEnd'); //通知播放结束
+					uni.$emit('playend'); //通知播放结束
 				}
 				
 				self.ossAvatarUrl = ''
@@ -1095,26 +1098,28 @@ export default {
 			if (polyvPlayerContext != null) {
 				
 				this.playTime = polyvPlayerContext.getCurrentTime() //播放时刻
-				console.log(this.photoIndex,789)
 				//判断是否需要拍照
 				if (this.photoNum > 0) {
 					this.configPhoto()
-					let photoTime =0; //获取拍照秒数
-					for(let i=0;i<this.photoList.length;i++){
-						photoTime = Number(this.photoList[i]); //获取拍照秒数
-						if (photoTime < this.playTime&&photoTime>this.playTime-4) { //3秒区间内才触发拍照，避免拉动滚动条
-							if(this.photoHistoryList.indexOf(i)<0){ //不存在拍照历史则拍照
+					if(this.photoIndex<this.photoList.length){
+						let photoTime = Number(this.photoList[this.photoIndex]); //获取拍照秒数
+						let nextIndex = this.photoIndex+1
+						let nextTime = 0
+						if(nextIndex<this.photoList.length){
+							nextTime = Number(this.photoList[nextIndex]); //获取下次拍照秒数
+						}
+						if (photoTime < this.playTime&&photoTime>this.playTime-4) { //3秒区间内才触发拍照，避免拉动滚动条 
+							if(this.photoHistoryList.indexOf(this.photoIndex)<0){ //不存在拍照历史则拍照
 								//启动拍照
 								//暂停
 								polyvPlayerContext.exitFullScreen();
 								polyvPlayerContext.pause();
-								this.photoHistoryList.push(i)
-								this.photoIndex = i
+								this.photoIndex++;
 								this.openPhoto();
 								
-								
 							}
 							
+							
 						}
 					}