修复bug

common/request.js

@@ -19,7 +19,8 @@ export const tenantId = '867735392558919680'
 export const myRequest = (options) => {
 	if (store.state.allowLoading && !options.noLoading) {
 		uni.showLoading({
-			title: '拼命加载中...'
+			title: '拼命加载中...',
+			mask:true,
 		})
 	}
 

pages2/bank/questionBank.vue

@@ -412,7 +412,7 @@
 								v-for="(item, index) in questionList"
 								:key="index"
 								@click="changeIndex(index)"
-								:class="{ isRight: isRight(item, index), isWrong: isWrong(item, index) }"
+								:class="{ isRight: isRight(item, index), isWrong: isWrong(item, index),isOver:isOver(item,index) }"
 								class="liListSty"
 							>
 								{{ index + 1 }}
@@ -1983,6 +1983,44 @@ export default {
 				return false;
 			}
 		},
+		isOver(item,index) {
+			if(this.questionList[index].ques) {
+				if (item.type == 4) { //案例题
+					let isOver = item.jsonStr.every((jsonItem, indexs) => {
+						if (jsonItem.type == 1 || jsonItem.type == 2 || jsonItem.type == 3) {
+							if (item.ques[indexs]) {
+								return true;
+							} else {
+								return false;
+							}
+						} else if (jsonItem.type == 5) {
+							if (item.ques[indexs] && (item.ques[indexs].text || item.ques[indexs].imageList.length)) {
+								console.log('chil')
+								return true;
+							} else {
+								return false;
+							}
+						}
+					});
+					
+					if (isOver) {
+						return true;
+					} else {
+						return false;
+					}
+				} else if (item.type == 5) { //简答题
+					//每一项都相等
+					if(item.ques && (item.ques.imageList.length || item.ques.text)) {
+						return true;
+					}
+					//判断
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		},
 
 		tabSelect(index, bankindex) {
 			this.$set(this.questionList[bankindex], 'current', index);
@@ -2380,6 +2418,12 @@ export default {
 		color: #fff;
 		background: #FF3B30;
 	}
+	
+	&.isOver {
+		border: 1rpx solid #eeeeee;
+		color: #fff;
+		background: blue;
+	}
 }
 .answerInfos {
 	padding: 25rpx 25rpx 25rpx 23rpx;

pages2/bank/questionBankContinue.vue

@@ -395,7 +395,7 @@
 				<view class="popupContent">
 					<scroll-view scroll-y="true" style="height: 506rpx;">
 						<view class="boxSty">
-							<view v-for="(item, index) in questionList" :key="index" @click="changeIndex(index)" :class="{isRight:isRight(item,index),isWrong:isWrong(item,index)}" class="liListSty">{{ index + 1 }}</view>
+							<view v-for="(item, index) in questionList" :key="index" @click="changeIndex(index)" :class="{isRight:isRight(item,index),isWrong:isWrong(item,index),isOver:isOver(item,index)}" class="liListSty">{{ index + 1 }}</view>
 						</view>
 					</scroll-view>
 				</view>
@@ -1456,6 +1456,44 @@ export default {
 			}
 			
 		},
+		isOver(item,index) {
+			if(this.questionList[index].ques) {
+				if (item.type == 4) { //案例题
+					let isOver = item.jsonStr.every((jsonItem, indexs) => {
+						if (jsonItem.type == 1 || jsonItem.type == 2 || jsonItem.type == 3) {
+							if (item.ques[indexs]) {
+								return true;
+							} else {
+								return false;
+							}
+						} else if (jsonItem.type == 5) {
+							if (item.ques[indexs] && (item.ques[indexs].text || item.ques[indexs].imageList.length)) {
+								console.log('chil')
+								return true;
+							} else {
+								return false;
+							}
+						}
+					});
+					
+					if (isOver) {
+						return true;
+					} else {
+						return false;
+					}
+				} else if (item.type == 5) { //简答题
+					//每一项都相等
+					if(item.ques && (item.ques.imageList.length || item.ques.text)) {
+						return true;
+					}
+					//判断
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		},
 		
 		tabSelect(index,bankindex) {
 			
@@ -1864,6 +1902,12 @@ export default {
 		color:#fff;
 		background: #FF3B30;
 	}
+	
+	&.isOver {
+		border: 1rpx solid #eeeeee;
+		color: #fff;
+		background: blue;
+	}
 }
 .answerInfos {
 	padding: 25rpx 25rpx 25rpx 23rpx;

pages2/class/questionBank.vue

@@ -418,7 +418,7 @@
 								v-for="(item, index) in questionList"
 								:key="index"
 								@click="changeIndex(index)"
-								:class="{ isRight: isRight(item, index), isWrong: isWrong(item, index) }"
+								:class="{ isRight: isRight(item, index), isWrong: isWrong(item, index),isOver:isOver(item,index) }"
 								class="liListSty"
 							>
 								{{ index + 1 }}
@@ -2045,6 +2045,45 @@ export default {
 				return false;
 			}
 		},
+		
+		isOver(item,index) {
+			if(this.questionList[index].ques) {
+				if (item.type == 4) { //案例题
+					let isOver = item.jsonStr.every((jsonItem, indexs) => {
+						if (jsonItem.type == 1 || jsonItem.type == 2 || jsonItem.type == 3) {
+							if (item.ques[indexs]) {
+								return true;
+							} else {
+								return false;
+							}
+						} else if (jsonItem.type == 5) {
+							if (item.ques[indexs] && (item.ques[indexs].text || item.ques[indexs].imageList.length)) {
+								console.log('chil')
+								return true;
+							} else {
+								return false;
+							}
+						}
+					});
+					
+					if (isOver) {
+						return true;
+					} else {
+						return false;
+					}
+				} else if (item.type == 5) { //简答题
+					//每一项都相等
+					if(item.ques && (item.ques.imageList.length || item.ques.text)) {
+						return true;
+					}
+					//判断
+				} else {
+					return false;
+				}
+			} else {
+				return false;
+			}
+		},
 
 		tabSelect(index, bankindex) {
 			this.$set(this.questionList[bankindex], 'current', index);
@@ -2476,6 +2515,13 @@ export default {
 		color: #fff;
 		background: #FF3B30;
 	}
+	
+	
+	&.isOver {
+		border: 1rpx solid #eeeeee;
+		color: #fff;
+		background: blue;
+	}
 }
 .answerInfos {
 	padding: 25rpx 25rpx 25rpx 23rpx;

pages2/order/confirm_pay.vue

@@ -131,7 +131,8 @@ export default {
 					uni.setStorageSync('updateCart',1) //提醒刷新购物车
 					let data = res.data.data
 					uni.showLoading({
-						title:'支付中'
+						title:'支付中',
+						mask:true,
 					})
 					uni.requestPayment({
 					    provider: data.provider,

pages2/verify/input.vue

@@ -861,7 +861,7 @@ export default {
 				this.$nextTick(() => {
 					this.agreementModal = true;
 				})
-				self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId }).then(result => {
+				self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId ,orderGoodsId:self.orderGoodsId}).then(result => {
 					if (result.data.code === 200) {
 						if (!result.data.data) {
 							self.$api.getbaseprofiletplistProfile({ pageNum: 1, pageSize: 1, status: 1 }).then(kit => {

pages2/verify/input2.vue

@@ -300,7 +300,7 @@ export default {
 			this.$api.getbaseprofiletpId(this.goodsId).then(res => {
 				var ast = JSON.parse(res.data.data.keyValue2);
 				self.listData = ast;
-				self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId }).then(result => {
+				self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId,orderGoodsId:self.orderGoodsId }).then(result => {
 					if (result.data.code === 200) {
 						if (result.data.data && result.data.data.status === 3) {
 							self.remark = result.data.data.text;

pages3/polyv/detail.vue

@@ -836,27 +836,44 @@ export default {
 				// let initSpace = 0
 				//没有历史拍照间隔数据
 				if(this.photoList.length==0){
-					// if(totalVideoTime >= 6000) { //大于10分钟
-					// 	if(photoNum == 1) { //只拍1张
-							
-					// 	} else if(photoNum == 3){ //拍3张
-							
-					// 	}
-					// } else { //小于10分钟，只拍一张
-						
-					// }
-					for(let i=0;i<photoNum;i++){
-						let s = this.randomNum(initSpace,initSpace+spaceTime)
-						if(s>totalVideoTime){
-							s = totalVideoTime-1
+					if(totalVideoTime >= 1500) { //大于15分钟
+						if(photoNum == 1) { //开头拍1张
+							this.photoList.push(1)
+						} else if(photoNum == 3){ //拍3张
+							this.photoList.push(1) //开头拍一张
+							let centerTime = Math.floor(totalVideoTime / 2); //获取中间时间
+							let centerMinTime = centerTime-300; //前后5分钟
+							let centerMaxTime = centerTime+300;
+							let centerTakeTime = this.randomNum(centerMinTime,centerMaxTime)
+							this.photoList.push(centerTakeTime) //中间拍一张
+							let endMaxTime = totalVideoTime - 60;
+							let endMinTime = totalVideoTime - 300;
+							let endTakeTime = this.randomNum(endMinTime,endMaxTime)
+							this.photoList.push(endTakeTime) //最后拍一张
 						}
-						if(s<=5){
-							s =5 //避免出现5秒内拍照时间
+					} else { //小于15分钟，只拍前后各一张
+						if(photoNum == 1) { //开头拍1张
+							this.photoList.push(1)
+						} else if(photoNum == 3){ //拍2张
+							this.photoList.push(1) //开头拍一张
+							let endMaxTime = totalVideoTime - 60;
+							let endMinTime = totalVideoTime - 300;
+							let endTakeTime = this.randomNum(endMinTime,endMaxTime)
+							this.photoList.push(endTakeTime) //最后拍一张
 						}
-						this.photoList.push(s)
-						initSpace+=spaceTime
 					}
-					console.log(this.photoList,"随机拍照时间数组11",photoNum,initSpace,spaceTime)
+					// for(let i=0;i<photoNum;i++){
+					// 	let s = this.randomNum(initSpace,initSpace+spaceTime)
+					// 	if(s>totalVideoTime){
+					// 		s = totalVideoTime-1
+					// 	}
+					// 	if(s<=5){
+					// 		s =5 //避免出现5秒内拍照时间
+					// 	}
+					// 	this.photoList.push(s)
+					// 	initSpace+=spaceTime
+					// }
+					console.log(this.photoList,"随机拍照时间数组11",photoNum)
 					this.postCoursePhotoRecord(true)//提交随机拍照时间数组
 				}
 				console.log(this.photoList,"随机拍照时间数组")