修复测试bug

pages/shopping/shoppingCart.vue

@@ -245,14 +245,14 @@ export default {
 					return false;
 				}
 			} else if (this.detail.templateType == 'apply') {
-				if (!this.applyObj.applyAreasJson) {
-					uni.showModal({
-						title: '提示',
-						content: '请选择报考地区',
-						showCancel: false
-					});
-					return false;
-				}
+				// if (!this.applyObj.applyAreasJson) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '请选择报考地区',
+				// 		showCancel: false
+				// 	});
+				// 	return false;
+				// }
 				if (!this.applyObj.examDateJson) {
 					uni.showModal({
 						title: '提示',
@@ -427,14 +427,14 @@ export default {
 					}
 				}
 				if (item.templateType == 'apply' && item.goodsType == 1) {
-					if (!item.applyAreas.areaName) {
-						uni.showModal({
-							title: '提示',
-							content: '请选择报考地区',
-							showCancel: false
-						});
-						return false;
-					}
+					// if (!item.applyAreas.areaName) {
+					// 	uni.showModal({
+					// 		title: '提示',
+					// 		content: '请选择报考地区',
+					// 		showCancel: false
+					// 	});
+					// 	return false;
+					// }
 				}
 			}
 			this.$store.commit('setShoppingCartList', { shoppingCartList: checkGoodsList });

pages2/appointment/index.vue

@@ -61,7 +61,7 @@
 			<view class="tipBox">
 				<view class="title">温馨提示</view>
 				<view class="main">
-					<view class="item">您所报考的【设备安装施工员】专业，</view>
+					<view class="item">您所报考的{{ listData.major }}专业，</view>
 					<view class="item">考试次数已经用完。</view>
 					<view class="item">需要预约考试的补考学员，</view>
 					<view class="item">请先购买补考机会。</view>

pages2/bank/questionBank.vue

@@ -1,6 +1,6 @@
 <template>
-	<view id="questionBank">
-		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" :statusBar="true" title="试卷"></uni-nav-bar>
+	<view class="questionBank">
+		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" ref="navbar" :statusBar="true" title="试卷"></uni-nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank, bankIndex) in questionList" :key="bankIndex">
 				<view class="pageContent">
@@ -514,12 +514,10 @@ export default {
 						icon:'none',
 						mask:true,
 						title:'考试时间到，自动交卷',
-						duration:2000
+						duration:10000
 					})
 
-					setTimeout(() => {
-						this.submit();
-					}, 1000);
+					this.submit();
 					return;
 				}
 				this.lastTime--;
@@ -1053,13 +1051,12 @@ export default {
 								clearInterval(this.timer);
 								uni.showToast({
 									icon:'none',
+									mask:true,
 									title:'考试时间到，自动交卷',
-									duration:1000
+									duration:10000
 								})
 
-								setTimeout(() => {
-									this.submit();
-								}, 1000);
+								this.submit();
 								return;
 							}
 							this.lastTime--;
@@ -1837,9 +1834,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+	
+.questionBank {
+	width:100%;
+	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
 .swiper {
 	width: 100%;
-	height: calc(100vh - 65px);
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/bank/questionBankExplain.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="questionBank">
+	<view class="questionBank">
 		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" :statusBar="true" title="试卷"></uni-nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank,bankIndex) in questionList" :key="bankIndex">
@@ -1441,9 +1441,15 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.questionBank {
+	width:100%;
+	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
 .swiper {
 	width:100%;
-	height: calc(100vh - 65px);
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/bank/questionBankExplainDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="questionBank">
+	<view class="questionBank">
 		<view class="tabs-top">
 			<u-tabs :list="list" sticky :current="tabCurrent" @change="tabChange" active-color="#007AFF"></u-tabs>
 		</view>
@@ -1344,6 +1344,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.questionBank {
+	width:100%;
+	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
 .tabs-top {
 	display: flex;
 	justify-content: center;
@@ -1351,7 +1357,7 @@ export default {
 }
 .swiper {
 	width:100%;
-	height:calc(100vh - 44px);
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/bank/question_report.vue

@@ -9,7 +9,7 @@
 
 			<view class="box">
 				<view class="left">
-					<view>{{ ((reportdata.rightQuestionNum / (reportdata.rightQuestionNum + wrongRecordWrongNum)) * 100).toFixed(0) }}%</view>
+					<view>{{ (((reportdata.rightQuestionNum / (reportdata.rightQuestionNum + wrongRecordWrongNum)) || 0) * 100).toFixed(0)}}%</view>
 					<view>正确率</view>
 					<view>不含简答/案例题</view>
 				</view>
@@ -34,7 +34,7 @@
 						'/pages2/subject/wrongBank?isFromReport=1&explain=1&id=' + reportdata.recordId+'&examId='+examData.examId
 					"
 				>
-					<view class="btnACs">错题解析</view>
+					<view class="btnACs" v-if="wrongRecordWrongNum != 0">错题解析</view>
 				</navigator>
 				<navigator
 					:url="
@@ -172,9 +172,12 @@ export default {
 	},
 	methods: {
 		backBank() {
-			uni.redirectTo({
-				url: '/pages2/bank/my_question'
-			});
+			uni.navigateBack({
+				delta:1
+			})
+			// uni.redirectTo({
+			// 	url: '/pages2/bank/my_question'
+			// });
 		},
 		bankExam(){
 			return new Promise(resolve =>{

pages2/class/questionBank.vue

@@ -1,5 +1,5 @@
 <template>
-	<view id="questionBank">
+	<view class="questionBank">
 		<uni-nav-bar @clickLeft="clickLeft" left-icon="back" :statusBar="true" title="试卷"></uni-nav-bar>
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
 			<swiper-item v-for="(bank, bankIndex) in questionList" :key="bankIndex">
@@ -524,13 +524,12 @@ export default {
 					clearInterval(this.timer);
 					uni.showToast({
 						icon:'none',
+						mask:true,
 						title:'考试时间到，自动交卷',
-						duration:1000
+						duration:10000
 					})
 
-					setTimeout(() => {
-						this.submit();
-					}, 1000);
+					this.submit();
 					return;
 				}
 				this.lastTime--;
@@ -1082,13 +1081,12 @@ export default {
 								clearInterval(this.timer);
 								uni.showToast({
 									icon:'none',
+									mask:true,
 									title:'考试时间到，自动交卷',
-									duration:1000
+									duration:10000
 								})
 
-								setTimeout(() => {
-									this.submit();
-								}, 1000);
+								this.submit();
 								return;
 							}
 							this.lastTime--;
@@ -1811,9 +1809,16 @@ export default {
 			font-weight: bold;
 		}
 	}
+	
+.questionBank {
+	width:100%;
+	height:100vh;
+	display: flex;
+	flex-direction: column;
+}
 .swiper {
 	width: 100%;
-	height: calc(100vh - 65px);
+	flex:1;
 }
 .lisSty {
 	margin-bottom: 16rpx;

pages2/course/detail.vue

@@ -188,7 +188,7 @@ export default {
 						this.timer = null
 						uni.showModal({
 							title: '提示',
-							content: '试听结束',
+							content: '试听结束，购买课程可学习全部',
 							showCancel:false,
 							success: function(resst) {
 								self.closePlay()

pages2/order/confirm_list.vue

@@ -225,22 +225,22 @@ export default {
 				})
 				return false
 			}
-			if(this.provinceList.length==0){
-				uni.showModal({
-					title: "提示",
-					content: '请选择报考地区',
-					showCancel: false
-				})
-				return false
-			}
-			if(this.cityList.length==0){
-				uni.showModal({
-					title: "提示",
-					content: '请选择报考地区',
-					showCancel: false
-				})
-				return false
-			}
+			// if(this.provinceList.length==0){
+			// 	uni.showModal({
+			// 		title: "提示",
+			// 		content: '请选择报考地区',
+			// 		showCancel: false
+			// 	})
+			// 	return false
+			// }
+			// if(this.cityList.length==0){
+			// 	uni.showModal({
+			// 		title: "提示",
+			// 		content: '请选择报考地区',
+			// 		showCancel: false
+			// 	})
+			// 	return false
+			// }
 			return true
 		},
 		checkData(){
@@ -255,14 +255,14 @@ export default {
 				}
 			}
 			else if(this.detail.templateType=='apply'&&this.detail.goodsType==1){
-				if(!this.applyObj.applyAreasJson){
-					uni.showModal({
-						title: "提示",
-						content: '请选择报考地区',
-						showCancel: false
-					})
-					return false
-				}
+				// if(!this.applyObj.applyAreasJson){
+				// 	uni.showModal({
+				// 		title: "提示",
+				// 		content: '请选择报考地区',
+				// 		showCancel: false
+				// 	})
+				// 	return false
+				// }
 				if(!this.applyObj.examDateJson){
 					uni.showModal({
 						title: "提示",

pages2/wd/info.vue

@@ -42,7 +42,7 @@
 						<view>所在城市</view>
 						<view class="rBox">
 							<pick-regions :defaultRegion="defaultRegionCode" @getRegion="handleGetRegion2">
-								<view class="picker">{{ form.province }} {{ form.city }} {{ form.district }}</view>
+								<view class="picker">{{ form.province || '-' }} {{ form.city || '-' }} {{ form.district || '-' }}</view>
 							</pick-regions>
 						<u-icon name="arrow-right" color="#999999" size="28"></u-icon></view>
 					</view>