Merge branch 'master' into stage-4

# Conflicts:
#	pages3/polyv/detail.vue

components/course/courseChapter.vue

@@ -8,7 +8,7 @@
 		<view v-if="!down">
 			<view v-for="(itemM,indexM) in list" >
 				<view v-if="itemM.type!=2">
-					<courseSection :courseId="courseId"  :goodsId="goodsId" :isBuy="isBuy" :isRebuild="isRebuild" :gradeId="gradeId" :menuItem="itemM" :levelId="levelId+'-'+itemM.sectionId"></courseSection>
+					<courseSection :courseId="courseId"  :goodsId="goodsId" :isBuy="isBuy" :nextMenuItem="findNextSection(indexM)" :isRebuild="isRebuild" :gradeId="gradeId" :menuItem="itemM" :levelId="levelId+'-'+itemM.sectionId"></courseSection>
 					<u-line v-if="indexM<list.length-1"></u-line>
 				</view>
 				<view v-if="itemM.type==2">
@@ -95,6 +95,12 @@ export default {
 	mounted() {
 	},
 	methods: {
+		findNextSection(index){
+			for(let i=index+1;i<this.list.length;i++){
+				return this.list[i];
+			}
+			return {}
+		},
 		/**
 		 * 去做题
 		 */

pages2/class/questionBank.vue

@@ -674,7 +674,18 @@ export default {
 				photo: self.ossAvatarUrl,
 				recordId: self.recordId
 			};
+			console.log(data,"拍照提交")
 			this.$api.studyExamPhotoRecord(data).then(res => {
+				console.log(res,"拍照提交结果")
+				if(res.data.code!=200){
+					uni.showToast({
+						icon:'none',
+						mask:true,
+						title:res.data.msg,
+						duration:10000
+					})
+					return
+				}
 				self.ossAvatarUrl = ''
 				self.isTakePhoto = true;
 				//拍照

pages3/polyv/detail.vue

@@ -157,7 +157,7 @@
 					</view>
 					<!--节 -->
 					<view v-if="item.type == 3">
-						<courseSection :courseId="courseId" :gradeId="gradeId" :goodsId="goodsId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection>
+						<courseSection :courseId="courseId" :gradeId="gradeId" :goodsId="goodsId" :isRebuild="true" :isBuy="true" :nextMenuItem="findMenuNextSection(index)"  :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection>
 					</view>
 				</view>
 			</view>
@@ -457,6 +457,15 @@ export default {
 				this.courseHandoutsData = res.data.data
 			})
 		},
+		findMenuNextSection(index){
+			for(let i=index+1;i<this.reMenuList.length;i++){
+				let item = this.reMenuList[i]
+				if(item.type==3){
+					return item;
+				}
+			}
+			return {}
+		},
 		getPhotoLastRecord() {
 			let self = this;
 			let data = {