he2802 3 jaren geleden
bovenliggende
commit
0512b34edb
2 gewijzigde bestanden met toevoegingen van 25 en 3 verwijderingen
  1. 4 1
      components/course/courseSection.vue
  2. 21 2
      pages2/class/questionBank.vue

+ 4 - 1
components/course/courseSection.vue

@@ -25,7 +25,10 @@
 				<view v-if="menuItem.sectionType==null">{{menuItem.name}}</view>
 			</view>
 			<view v-if="isRebuild||menuItem.rebuild>0" class="tagRe">待重修</view>
-			<view v-if="menuItem.learning==1" class="tagGreen">已看完</view>
+			<view v-else>
+				<view v-if="menuItem.learning==1" class="tagGreen">已看完</view>
+			</view>
+			
 		</view>
 		<view v-if="menuItem.tryListen&&!isBuy" class="tryBox">
 			试看

+ 21 - 2
pages2/class/questionBank.vue

@@ -488,7 +488,9 @@ export default {
 			courseId:0,
 			cgType: 0 ,//对应设计稿弹窗编码,
 			avatarUrl:'',
-			ossAvatarUrl: ''
+			ossAvatarUrl: '',
+			goodsDetail:{},
+			needPhoto:false //是否需要拍照
 		};
 	},
 	onLoad(option) {
@@ -537,6 +539,7 @@ export default {
 		} else {
 			this.goodsQuestionList();
 			this.bankExam();
+			this.getGoodsDetail()
 		}
 	},
 	onUnload() {
@@ -559,6 +562,19 @@ export default {
 		}
 	},
 	methods: {
+		getGoodsDetail() {
+			let self = this
+			this.$api.goodsDetail(this.goodsId).then(res => {
+				self.goodsDetail = res.data.data;
+				if (self.goodsDetail.goodsPhotoExamConfig) {
+					let goodsPhotoExamConfig = JSON.parse(self.goodsDetail.goodsPhotoExamConfig);
+					if (goodsPhotoExamConfig.photograph > 0) {
+						self.needPhoto = true;
+					}
+				}
+				
+			});
+		},
 		postStudyRecord() {
 			let self = this
 			let data = {
@@ -1187,7 +1203,10 @@ export default {
 				})
 				.then(res => {
 					this.recordId = res.data.data;
-					self.photoPopup = true; //拍照
+					if(self.needPhoto){
+						self.photoPopup = true; //拍照
+					}
+					
 				});
 			
 		},