init

pages2/bank/question_detail.vue

@@ -1,26 +1,28 @@
 <template>
 	<view>
 		<view class="top">
-			<navigator :url="'/pages2/bank/question_statistics?id='+id">
+			<navigator :url="'/pages2/bank/question_statistics?id=' + id">
 				<view class="left">
 					<view class="title">做题统计</view>
 					<view class="progress">
 						<view class="item-left">
-							<view class="desc">
-								<text>总进度</text>
-							</view>
+							<view class="desc"><text>总进度</text></view>
 							<view class="percent">
-								{{goodsCount.totalNum>0?(goodsCount.doNum/goodsCount.totalNum * 100).toFixed(goodsCount.doNum/goodsCount.totalNum * 100 == 100 ? 0 : 1):0}}
+								{{
+									goodsCount.totalNum > 0
+										? ((goodsCount.doNum / goodsCount.totalNum) * 100).toFixed((goodsCount.doNum / goodsCount.totalNum) * 100 == 100 ? 0 : 1)
+										: 0
+								}}
 								<text class="per">%</text>
 							</view>
 						</view>
 						<view class="item-right">
-							<view class='up'>
-								<text class="orange">{{goodsCount.doNum}}</text>
-								<text>/{{goodsCount.totalNum - goodsCount.doNum}}</text>
+							<view class="up">
+								<text class="orange">{{ goodsCount.doNum }}</text>
+								<text>/{{ goodsCount.totalNum - goodsCount.doNum }}</text>
 							</view>
-							
-							<view class='down'>
+
+							<view class="down">
 								<text class="orange">已答</text>
 								<text>/未答</text>
 							</view>
@@ -28,79 +30,77 @@
 					</view>
 				</view>
 			</navigator>
-			<navigator :url="'/pages2/bank/wrongById?goodsid='+id">
+			<navigator :url="'/pages2/bank/wrongById?goodsid=' + id">
 				<view class="right">
-						<view class="title">
-							错题集 <u-icon name="arrow-right"></u-icon>
-						</view>
-						<view class="number">
-							{{goodsCount.wrongNum}}
-						</view>
+					<view class="title">
+						错题集
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+					<view class="number">{{ goodsCount.wrongNum }}</view>
 				</view>
 			</navigator>
-			<navigator :url="'/pages2/bank/collectById?goodsid='+id">
+			<navigator :url="'/pages2/bank/collectById?goodsid=' + id">
 				<view class="right">
 					<view class="title">
-						收藏集 <u-icon name="arrow-right"></u-icon>
-					</view>
-					<view class="number">
-							{{goodsCount.collectNum}}
+						收藏集
+						<u-icon name="arrow-right"></u-icon>
 					</view>
+					<view class="number">{{ goodsCount.collectNum }}</view>
 				</view>
 			</navigator>
 		</view>
 		<view class="title-list">
 			<view class="content">
-				<view class="list" v-for="(item1,index1) in bankList" :key="index1">
-					<template v-if="item1.type==1">
-						<view class="moduleItem" @click="clickModule(item1.majorId,index1)">
-							<view class="courseName">{{item1.name}}</view>
+				<view class="list" v-for="(item1, index1) in bankList" :key="index1">
+					<template v-if="item1.type == 1">
+						<view class="moduleItem" @click="clickModule(item1.majorId, index1)">
+							<view class="courseName">{{ item1.name }}</view>
 							<view>
 								<image src="/static/icon/up.png" class="icon_up" v-if="!item1.showList"></image>
 								<image src="/static/icon/down.png" class="icon_up" v-if="item1.showList"></image>
 							</view>
 						</view>
-						
+
 						<template v-if="item1.showList">
-							<view v-for="(item2,index2) in item1.list" :key="index2" >
-								<view class="section" @click="changeItem(index1,item2.chapterExamId,item1.type)">
-									<image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
-									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image>
-									{{item2.name}}
+							<view v-for="(item2, index2) in item1.list" :key="index2">
+								<view class="section" @click="changeItem(index1, item2.chapterExamId, item1.type, index2)">
+									<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
+									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image> -->
+									<u-icon name="arrow-up" color="#999" size="24" v-if="item2.showList"></u-icon>
+									<u-icon name="arrow-down" color="#999" size="24" v-if="!item2.showList"></u-icon>
+									<text style="margin-left:34rpx;">{{ item2.name }}</text>
 								</view>
-								<view  v-if="item2.showList">
-									<view class="article" :class="{active:index3 == 0}"  v-for="(article,index3) in item2.list" :key="index3">
-										<view class="flex_auto">{{article.examName}}</view>
-										<view class="btn" @click="toDo(article.examId,goodsData.goodsId,item1.majorId,item2.chapterExamId)">做题</view>
+								<view v-if="item2.showList">
+									<view class="article active" style="margin-left:62rpx;" v-for="(article, index3) in item2.list" :key="index3">
+										<view class="flex_auto">{{ article.examName }}</view>
+										<view class="btn" @click="toDo(article.examId, goodsData.goodsId, item1.majorId, item2.chapterExamId)">做题</view>
 									</view>
 								</view>
 								<u-line></u-line>
 							</view>
 						</template>
-						
-						
 					</template>
-					
-					<template v-if="item1.type ==2">
-						<view class="section" @click="changeItem(index1,item1.majorId,item1.type)">
-							<image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
-							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image>
-							{{item1.name}}
+
+					<template v-if="item1.type == 2">
+						<view class="section" @click="changeItem(index1, item1.majorId, item1.type)">
+							<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
+							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image> -->
+							<u-icon name="arrow-up" color="#999" size="24" v-if="item1.showList"></u-icon>
+							<u-icon name="arrow-down" color="#999" size="24" v-if="!item1.showList"></u-icon>
+							<text style="margin-left:34rpx;">{{ item1.name }}</text>
 						</view>
-						<view v-if="item1.showList" >
-							<view class="article" :class="{active:index2 == 0}"  :key="index3" v-for="(article,index2) in item1.list">
-								<view class="flex_auto">{{item1.name}}</view>
-									<view class="btn"  @click="toDo(article.majorId,goodsData.goodsId,0,item1.majorId)">做题</view>
-								
+						<view v-if="item1.showList">
+							<view class="article active" style="margin-left:64rpx;" v-for="(article, index2) in item1.list" :key="index2">
+								<view class="flex_auto">{{ item1.name }}</view>
+								<view class="btn" @click="toDo(article.examId, goodsData.goodsId, 0, item1.majorId)">做题</view>
 							</view>
 						</view>
 					</template>
-					
-					<template v-if="item1.type ==3">
-						<view class="article active" >
-							<view class="flex_auto">{{item1.name}}</view>
-								<view class="btn" @click="toDo(item1.majorId,goodsData.goodsId,0,0)">做题</view>
-							
+
+					<template v-if="item1.type == 3">
+						<view class="article active">
+							<view class="flex_auto">{{ item1.name }}</view>
+							<view class="btn" @click="toDo(item1.majorId, goodsData.goodsId, 0, 0)">做题</view>
 						</view>
 					</template>
 				</view>
@@ -114,383 +114,373 @@ import { mapGetters } from 'vuex';
 export default {
 	data() {
 		return {
-			goodsData:{},
-			bankList:[],
-			id:'',
-			goodsCount:{
-				totalNum:0
+			goodsData: {},
+			bankList: [],
+			id: '',
+			goodsCount: {
+				totalNum: 0
 			}
 		};
 	},
-	onUnload() {
-		
-	},
+	onUnload() {},
 	computed: { ...mapGetters(['userInfo']) },
 	onLoad(option) {
-		this.id = option.id
+		this.id = option.id;
 		this.getDetail();
 		this.goodsBankList();
 		// this.getCollectNum();
 		// this.getWrongNum()
 		this.goodsBankQuestionNum();
 	},
-	onShow() {
-		
-	},
+	onShow() {},
 	methods: {
-		getDetail(){
+		getDetail() {
 			this.$api.commonGoodsDetail(this.id).then(res => {
-				console.log(res)
+				console.log(res);
 				this.goodsData = res.data.data;
-				 
-			})
+			});
 		},
-		
+
 		/**
 		 * 去做题
 		 */
-		async toDo(id,goodsId,moduleId = 0, chapterId = 0) {
-			
+		async toDo(id, goodsId, moduleId = 0, chapterId = 0) {
+			console.log(id,goodsId,moduleId,chapterId)
 			let count = await this.examRecordCount(id);
 			let answerNum = await this.getExamDetail(id);
 			//超过答题次数
-			
-			if(answerNum>0&&count >= answerNum) {
-				this.$u.toast('该试卷只能答题'+answerNum+'次!');
-				return
+
+			if (answerNum > 0 && count >= answerNum) {
+				this.$u.toast('该试卷只能答题' + answerNum + '次!');
+				return;
 			}
-			
+
 			uni.navigateTo({
-				url:'/pages2/bank/questionBank?id='+id+'&goodsid='+goodsId+'&moduleId='+moduleId+'&chapterId='+chapterId+''
-			})
+				url: '/pages2/bank/questionBank?id=' + id + '&goodsid=' + goodsId + '&moduleId=' + moduleId + '&chapterId=' + chapterId + ''
+			});
 		},
-		
+
 		/**
 		 * 查询试卷历史做题次数
 		 */
 		examRecordCount(examId) {
 			return new Promise(resolve => {
-				
-				this.$api.examRecordCount({
-					examId:examId,
-					goodsId:this.id
-				}).then(res => {
-					
-					resolve(res.data.data)
-				})
-			})
+				this.$api
+					.examRecordCount({
+						examId: examId,
+						goodsId: this.id
+					})
+					.then(res => {
+						resolve(res.data.data);
+					});
+			});
 		},
 		/**
 		 * @param {Object} exam_id
 		 * 获取试卷可以做的次数
 		 */
-		getExamDetail(exam_id){
+		getExamDetail(exam_id) {
 			return new Promise(resolve => {
-			this.$api.getExamDetail(exam_id).then(res => {
-				resolve(res.data.data.answerNum)
-			})
-			})
+				this.$api.getExamDetail(exam_id).then(res => {
+					resolve(res.data.data.answerNum);
+				});
+			});
 		},
 		/**
 		 * 获取用户商品统计数据
 		 */
-		goodsBankQuestionNum(){
+		goodsBankQuestionNum() {
 			this.$api.goodsBankQuestionNum(this.id).then(res => {
-				this.goodsCount = res.data.data
-			})
+				this.goodsCount = res.data.data;
+			});
 		},
-		
+
 		goodsBankList() {
-			this.$api.goodsBankList({
-				goodsId:this.id
-			}).then(res => {
-				console.log(res)
-				this.bankList = res.data.data;
-			})
+			this.$api
+				.goodsBankList({
+					goodsId: this.id
+				})
+				.then(res => {
+					console.log(res);
+					this.bankList = res.data.data;
+				});
 		},
 		getCollectNum() {
-			this.$api.goodsCollectExamList({
-				goodsId:this.id
-			}).then(res => {
-				let total = 0;
-				res.data.rows.forEach(item => {
-					total += item.questionNum;
+			this.$api
+				.goodsCollectExamList({
+					goodsId: this.id
 				})
-				
-				this.collectTotal = total
-			})
+				.then(res => {
+					let total = 0;
+					res.data.rows.forEach(item => {
+						total += item.questionNum;
+					});
+
+					this.collectTotal = total;
+				});
 		},
 		getWrongNum() {
-			this.$api.wrongRecordList({
-				goodsId:this.id
-			}).then(res => {
-				let total = 0;
-				res.data.rows.forEach(item => {
-					total += item.wrongQuestionNum;
+			this.$api
+				.wrongRecordList({
+					goodsId: this.id
 				})
-				
-				this.wrongTotal = total
-			})
+				.then(res => {
+					let total = 0;
+					res.data.rows.forEach(item => {
+						total += item.wrongQuestionNum;
+					});
+
+					this.wrongTotal = total;
+				});
 		},
-		clickModule(id,index) {
-			
-			
-			if(this.bankList[index].list) {
-				this.$set(this.bankList[index],'showList',!this.bankList[index].showList)
+		clickModule(id, index) {
+			if (this.bankList[index].list) {
+				this.$set(this.bankList[index], 'showList', !this.bankList[index].showList);
 				return;
 			}
-			
-			this.$api.goodsChapterList({
-				moduleExamId:id
-			}).then(res => {
-				this.$set(this.bankList[index],'showList',true)
-				this.$set(this.bankList[index],'list',res.data.data)
-				 
-			})
+
+			this.$api
+				.goodsChapterList({
+					moduleExamId: id
+				})
+				.then(res => {
+					this.$set(this.bankList[index], 'showList', true);
+					this.$set(this.bankList[index], 'list', res.data.data);
+				});
 		},
-		changeItem(index1,id,type) {
-			
-			if(type == 1) {
-				if(this.bankList[index1].list[index2].list) {
-					this.$set(this.bankList[index1].list[index2],'showList',!this.bankList[index1].list[index2].showList)
+		changeItem(index1, id, type, index2) {
+			if (type == 1) {
+				console.log();
+				if (this.bankList[index1].list[index2].list) {
+					console.log(2);
+					this.$set(this.bankList[index1].list[index2], 'showList', !this.bankList[index1].list[index2].showList);
 					return;
 				}
-				
-				this.$api.goodsExamList({
-					chapterExamId:id
-				}).then(res => {
-					
-					this.$set(this.bankList[index1].list[index2],'showList',true)
-					this.$set(this.bankList[index1].list[index2],'list',res.data.data)
-					
-					 
-				})
-				
-			} else if(type == 2) {
-				if(this.bankList[index1].list) {
-					this.$set(this.bankList[index1],'showList',!this.bankList[index1].showList)
+
+				this.$api
+					.goodsExamList({
+						chapterExamId: id
+					})
+					.then(res => {
+						console.log(3);
+						this.$set(this.bankList[index1].list[index2], 'showList', true);
+						this.$set(this.bankList[index1].list[index2], 'list', res.data.data);
+					});
+			} else if (type == 2) {
+				if (this.bankList[index1].list) {
+					this.$set(this.bankList[index1], 'showList', !this.bankList[index1].showList);
 					return;
 				}
-				
-				this.$api.goodsExamList({
-					chapterExamId:id
-				}).then(res => {
-					
-					this.$set(this.bankList[index1],'showList',true)
-					this.$set(this.bankList[index1],'list',res.data.data)
-					
-					 
-				})
+
+				this.$api
+					.goodsExamList({
+						chapterExamId: id
+					})
+					.then(res => {
+						this.$set(this.bankList[index1], 'showList', true);
+						this.$set(this.bankList[index1], 'list', res.data.data);
+					});
 			}
-			
-			
-			
 		}
 	}
 };
 </script>
-<style >
-	page{
-		background-color: #EAEEF1;
-	}
+<style>
+page {
+	background-color: #eaeef1;
+}
 </style>
 <style lang="scss" scope>
-	
-	.top {
-		padding:16rpx 16rpx 0;
-		display: flex;
-		justify-content: space-between;
-		.left {
-			width: 326rpx;
-			height: 180rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 0px 16rpx 4rpx rgba(145, 156, 178, 0.1);
-			border-radius: 16rpx;
-			background:#fff;
-			padding:20rpx;
-			
-			.title {
-				font-size: 24rpx;
-				line-height: 24rpx;
-				color: #333333;
-			}
-			
-			.progress {
-				margin-top:10rpx;
-				display: flex;
-				
-				.item-left {
-					flex:1;
-					border-right:1rpx solid #EEEEEE;
-					.desc {
-						text {
-							line-height: 24rpx;
-							font-size: 24rpx;
-							color: #999999;
-						}
-					}
-					
-					.percent {
-						margin-top:10rpx;
-						line-height: 64rpx;
-						font-size: 64rpx;
-						font-weight: bold;
-						color: #007AFF;
-					}
-					
-					.per {
-						font-size: 30rpx;
-						color: #007AFF;
-					}
-				}
-				
-				.item-right {
-					padding-left:10rpx;
-					flex:1;
-					
+.top {
+	padding: 16rpx 16rpx 0;
+	display: flex;
+	justify-content: space-between;
+	.left {
+		width: 326rpx;
+		height: 180rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 16rpx 4rpx rgba(145, 156, 178, 0.1);
+		border-radius: 16rpx;
+		background: #fff;
+		padding: 20rpx;
+
+		.title {
+			font-size: 24rpx;
+			line-height: 24rpx;
+			color: #333333;
+		}
+
+		.progress {
+			margin-top: 10rpx;
+			display: flex;
+
+			.item-left {
+				flex: 1;
+				border-right: 1rpx solid #eeeeee;
+				.desc {
 					text {
-						
 						line-height: 24rpx;
 						font-size: 24rpx;
 						color: #999999;
 					}
-					
-					.orange {
-						line-height: 24rpx;
-						font-size: 24rpx;
-						font-weight: bold;
-						color: #FF9500;
-					}
-					
-					.down {
-						margin-top:40rpx;
-					}
+				}
+
+				.percent {
+					margin-top: 10rpx;
+					line-height: 64rpx;
+					font-size: 64rpx;
+					font-weight: bold;
+					color: #007aff;
+				}
+
+				.per {
+					font-size: 30rpx;
+					color: #007aff;
+				}
+			}
+
+			.item-right {
+				padding-left: 10rpx;
+				flex: 1;
+
+				text {
+					line-height: 24rpx;
+					font-size: 24rpx;
+					color: #999999;
+				}
+
+				.orange {
+					line-height: 24rpx;
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #ff9500;
+				}
+
+				.down {
+					margin-top: 40rpx;
 				}
 			}
 		}
-		
-		.right {
-			width: 180rpx;
-			height: 180rpx;
-			background: #FFFFFF;
-			box-shadow: 0px 0px 16rpx 4rpx rgba(145, 156, 178, 0.1);
-			background:#fff;
-			padding:20rpx;
+	}
+
+	.right {
+		width: 180rpx;
+		height: 180rpx;
+		background: #ffffff;
+		box-shadow: 0px 0px 16rpx 4rpx rgba(145, 156, 178, 0.1);
+		background: #fff;
+		padding: 20rpx;
+		border-radius: 16rpx;
+
+		.title {
+			font-size: 24rpx;
+			line-height: 24rpx;
+			color: #333333;
+		}
+
+		.number {
+			font-weight: bold;
+			text-align: center;
+			margin-top: 46rpx;
+			font-size: 64rpx;
+			line-height: 64rpx;
+			color: #007aff;
+		}
+	}
+}
+
+.courseName {
+	font-size: 24rpx;
+	color:#666;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.moduleItem {
+	height: 80rpx;
+	color: #333333;
+	font-size: 32rpx;
+	line-height: 80rpx;
+	font-weight: bold;
+	display: flex;
+	justify-content: space-between;
+}
+
+.icon_up {
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.title-list {
+	background: #eaeef1;
+	padding: 16rpx 16rpx 124rpx;
+	.content {
+		.list {
+			background: #fff;
+			margin-bottom: 30rpx;
+			overflow: hidden;
 			border-radius: 16rpx;
-			
-			.title {
-				font-size: 24rpx;
-				line-height: 24rpx;
+			padding: 10rpx 16rpx;
+
+			.module {
+				font-size: 30rpx;
 				color: #333333;
+
+				.icon {
+					margin-right: 10rpx;
+				}
 			}
-			
-			.number {
+
+			.section {
+				font-size: 24rpx;
+				font-family: PingFang SC;
 				font-weight: bold;
-				text-align: center;
-				margin-top:46rpx;
-				font-size: 64rpx;
-				line-height: 64rpx;
-				color: #007AFF;
-			}
-		}
-	}
-	
-	
-	.courseName{
-		white-space:nowrap;
-		overflow:hidden;
-		text-overflow:ellipsis; 
-	}
-	
-	
-	.moduleItem{
-		height: 80rpx;
-		color: #333333;
-		font-size: 32rpx;
-		line-height: 80rpx;
-		font-weight: bold;
-		display: flex;
-		justify-content: space-between;
-	
-	}
-	
-	.icon_up{
-		width: 32rpx;
-		height: 32rpx;
-	}
-	
-	.title-list {
-		background: #EAEEF1;
-		padding:16rpx 16rpx 124rpx;
-		.content {
-			
-			.list {
-				background:#fff;
-				margin-bottom:30rpx;
+				color: #666;
+				white-space: nowrap;
 				overflow: hidden;
-				border-radius: 16rpx;
-				padding:10rpx 16rpx;
-				
-				.module {
-					font-size: 30rpx;
-					color: #333333;
-					
-					.icon {
-						margin-right:10rpx;
-					}
+				text-overflow: ellipsis;
+				margin: 20rpx 0;
+				display: flex;
+				align-items: center;
+			}
+
+			.article {
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+
+				font-size: 24rpx;
+				color: #666666;
+				border-bottom: 1rpx solid #eeeeee;
+				display: flex;
+
+				.flex_auto {
+					flex: 1;
 				}
-				
-				.section {
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-					white-space:nowrap;
-					overflow:hidden;
-					text-overflow:ellipsis; 
-					margin: 20rpx 0;
-					display: flex;
-					align-items: center;
+
+				&:nth-last-of-type(1) {
+					border: 0;
 				}
-				
-				.article {
-					height:80rpx;
-					display: flex;
-					align-items: center;
-					
-					font-size: 24rpx;
-					color: #666666;
-					border-bottom: 1rpx solid #EEEEEE;
-					display: flex;
-					
-					.flex_auto{
-						flex:1;
-					}
-					
-					&:nth-last-of-type(1) {
-						border:0;
-					}
-					
-					&.active {
-						color:#007AFF;
-						
-						
-						.btn {
-							width: 96rpx;
-							height: 48rpx;
-							line-height: 48rpx;
-							text-align: center;
-							color:#fff;
-							font-size: 30rpx;
-							border-radius:24rpx;
-							background: #007AFF;
-							margin-left:36rpx;
-							border-radius: 24rpx;
-						}
+
+				&.active {
+					color: #007aff;
+
+					.btn {
+						width: 96rpx;
+						height: 48rpx;
+						line-height: 48rpx;
+						text-align: center;
+						color: #fff;
+						font-size: 30rpx;
+						border-radius: 24rpx;
+						background: #007aff;
+						margin-left: 36rpx;
+						border-radius: 24rpx;
 					}
 				}
 			}
 		}
 	}
-	
+}
 </style>

pages2/bank/question_statistics.vue

@@ -5,7 +5,7 @@
 				做题统计
 				<text>（不含简答和案例题）</text>
 			</view>
-			
+
 			<view class="circle-wrap">
 				<view class="circle-list">
 					<view class="item">
@@ -13,41 +13,47 @@
 						<view class="text">正确率</view>
 					</view>
 					<view class="item">
-						<canvas  canvas-id="Canvas2"></canvas>
+						<canvas canvas-id="Canvas2"></canvas>
 						<view class="text">做题进度</view>
 					</view>
 					<view class="numbers">
-						<view class="blue">已答  {{goodsCount.doNum}}</view>
-						<view>总数  {{goodsCount.totalNum}}</view>
+						<view class="blue">已答 {{ goodsCount.doNum }}</view>
+						<view>总数 {{ goodsCount.totalNum }}</view>
 					</view>
 				</view>
 			</view>
-			
 		</view>
-		
+
 		<view class="title-list">
 			<view class="content">
-				<view class="list" v-for="(item1,index1) in bankList" :key="index1">
-					<template v-if="item1.type==1">
-						<view class="moduleItem" @click="clickModule(item1.majorId,index1)">
-							<view class="courseName">{{item1.name}}</view>
+				<view class="list" v-for="(item1, index1) in bankList" :key="index1">
+					<template v-if="item1.type == 1">
+						<view class="moduleItem" @click="clickModule(item1.majorId, index1)">
+							<view class="courseName">{{ item1.name }}</view>
 							<view>
 								<image src="/static/icon/up.png" class="icon_up" v-if="!item1.showList"></image>
 								<image src="/static/icon/down.png" class="icon_up" v-if="item1.showList"></image>
 							</view>
 						</view>
-						
+
 						<template v-if="item1.showList">
-							<view v-for="(item2,index2) in item1.list" :key="index2" >
-								<view class="section" @click="changeItem(index1,item2.chapterExamId,item1.type)">
-									<image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
-									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image>
-									{{item2.name}}
+							<view v-for="(item2, index2) in item1.list" :key="index2">
+								<view class="section" @click="changeItem(index1, item2.chapterExamId, item1.type)">
+									<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item2.showList"></image>
+									<image src="/static/icon/down1.png" class="icon_up" v-if="item2.showList"></image> -->
+									<u-icon name="arrow-up" color="#999" size="24" v-if="item2.showList"></u-icon>
+									<u-icon name="arrow-down" color="#999" size="24" v-if="!item2.showList"></u-icon>
+									<text
+										style="margin-left:34rpx;font-size: 24rpx;
+		color:#666;"
+									>
+										{{ item2.name }}
+									</text>
 								</view>
-								<view  v-if="item2.showList">
-									<view class="article"  v-for="(article,index3) in item2.list" :key="index3">
+								<view v-if="item2.showList">
+									<view class="article" v-for="(article, index3) in item2.list" :key="index3">
 										<view class="flex-auto">
-											<view class="tit">{{article.examName}}</view>
+											<view class="tit">{{ article.examName }}</view>
 											<view class="desc">
 												<view class="flex-auto">
 													正确率
@@ -59,28 +65,42 @@
 												</view>
 											</view>
 										</view>
-										<navigator :url="'/pages2/bank/questionBankExplain?continue=1&recordId='+article.recordId+'&id='+article.examId+'&goodsid='+article.goodsId+'&moduleId='+article.moduleExamId+'&chapterId='+article.chapterExamId+''">
-											<view class="btn"  v-if="article.recordStatus == 0">继续</view>
+										<navigator
+											:url="
+												'/pages2/bank/questionBankExplain?continue=1&recordId=' +
+													article.recordId +
+													'&id=' +
+													article.examId +
+													'&goodsid=' +
+													article.goodsId +
+													'&moduleId=' +
+													article.moduleExamId +
+													'&chapterId=' +
+													article.chapterExamId +
+													''
+											"
+										>
+											<view class="btn" v-if="article.recordStatus == 0">继续</view>
 										</navigator>
 									</view>
 								</view>
 								<u-line></u-line>
 							</view>
 						</template>
-						
-						
 					</template>
-					
-					<template v-if="item1.type ==2">
-						<view class="section" @click="changeItem(index1,item1.majorId,item1.type)">
-							<image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
-							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image>
-							{{item1.name}}
+
+					<template v-if="item1.type == 2">
+						<view class="section" @click="changeItem(index1, item1.majorId, item1.type)">
+							<!-- <image src="/static/icon/up1.png" class="icon_up" v-if="!item1.showList"></image>
+							<image src="/static/icon/down1.png" class="icon_up" v-if="item1.showList"></image> -->
+							<u-icon name="arrow-up" color="#999" size="24" v-if="item1.showList"></u-icon>
+							<u-icon name="arrow-down" color="#999" size="24" v-if="!item1.showList"></u-icon>
+							<text style="margin-left:34rpx;font-size: 24rpx;color:#666;">{{ item1.name }}</text>
 						</view>
-						<view v-if="item1.showList" >
-							<view class="article" :key="index3" v-for="(article,index2) in item1.list">
+						<view v-if="item1.showList">
+							<view class="article" :key="index3" v-for="(article, index2) in item1.list">
 								<view class="flex-auto">
-									<view class="tit">{{article.name}}</view>
+									<view class="tit">{{ article.name }}</view>
 									<view class="desc">
 										<view class="flex-auto">
 											正确率
@@ -92,18 +112,29 @@
 										</view>
 									</view>
 								</view>
-								<navigator :url="'/pages2/bank/questionBankExplain?continue=1&recordId='+article.recordId+'&id='+article.examId+'&goodsid='+article.goodsId+'&moduleId=0&chapterId='+article.chapterExamId+''">
+								<navigator
+									:url="
+										'/pages2/bank/questionBankExplain?continue=1&recordId=' +
+											article.recordId +
+											'&id=' +
+											article.examId +
+											'&goodsid=' +
+											article.goodsId +
+											'&moduleId=0&chapterId=' +
+											article.chapterExamId +
+											''
+									"
+								>
 									<view class="btn" v-if="article.recordStatus == 0">继续</view>
 								</navigator>
-								
 							</view>
 						</view>
 					</template>
-					
-					<template v-if="item1.type ==3">
-						<view class="article" >
+
+					<template v-if="item1.type == 3">
+						<view class="article">
 							<view class="flex-auto">
-								<view class="tit">{{item1.name}}</view>
+								<view class="tit">{{ item1.name }}</view>
 								<view class="desc">
 									<view class="flex-auto">
 										正确率
@@ -115,16 +146,24 @@
 									</view>
 								</view>
 							</view>
-							<navigator :url="'/pages2/bank/questionBankExplain?continue=1&recordId='+item1.recordId+'&id='+item1.majorId+'&goodsid='+item1.goodsId+'&moduleId=0&chapterId=0'">
+							<navigator
+								:url="
+									'/pages2/bank/questionBankExplain?continue=1&recordId=' +
+										item1.recordId +
+										'&id=' +
+										item1.majorId +
+										'&goodsid=' +
+										item1.goodsId +
+										'&moduleId=0&chapterId=0'
+								"
+							>
 								<view class="btn" v-if="item1.recordStatus == 0">继续</view>
 							</navigator>
-							
 						</view>
 					</template>
 				</view>
 			</view>
 		</view>
-		
 	</view>
 </template>
 
@@ -133,350 +172,338 @@ import { mapGetters } from 'vuex';
 export default {
 	data() {
 		return {
-			bankList:[],
-			goodsCount:{},
-			id:'',
-			context1:null,
-			context2:null,
-			caculateX:0,
-			caculateY:0,
+			bankList: [],
+			goodsCount: {},
+			id: '',
+			context1: null,
+			context2: null,
+			caculateX: 0,
+			caculateY: 0
 		};
 	},
-	onUnload() {
-		
-	},
+	onUnload() {},
 	computed: { ...mapGetters(['userInfo']) },
 	onLoad(option) {
-		 this.id = option.id;
+		this.id = option.id;
 		uni.getSystemInfo({
-			success:(res) => {
+			success: res => {
 				var winW = res.screenWidth;
 				var winH = res.screenHeight;
-				 uni.createSelectorQuery().in(this).select('.canvas').boundingClientRect().exec((newRes)=>{  
-					 
-					 this.goodsBankQuestionNum();
+				uni.createSelectorQuery()
+					.in(this)
+					.select('.canvas')
+					.boundingClientRect()
+					.exec(newRes => {
+						this.goodsBankQuestionNum();
 						this.goodsBankDolist();
-					// this.goodsBankList();
-					 
-					  var width = newRes[0].width;
-					  var height = newRes[0].height;
-					  this.caculateX = winW/750;
-					  this.caculateY = winH/1334;
-					  var context1 = uni.createCanvasContext('Canvas1')
-					  this.context1 = context1;
-					  context1.setStrokeStyle("#EEEEEE")
-					  context1.setLineWidth(this.caculateX * 20)
-					  context1.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, 2 * Math.PI, true)
-					  context1.stroke()
-					  context1.draw()
-					  
-					  
-					  
-					  
-					  var context2 = uni.createCanvasContext('Canvas2')
-					  this.context2 = context2;
-					  context2.setStrokeStyle("#EEEEEE")
-					  context2.setLineWidth(this.caculateX * 20)
-					  context2.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, 2 * Math.PI, false)
-					  context2.stroke()
-					  context2.draw()
-				})  
-				
+						// this.goodsBankList();
+
+						var width = newRes[0].width;
+						var height = newRes[0].height;
+						this.caculateX = winW / 750;
+						this.caculateY = winH / 1334;
+						var context1 = uni.createCanvasContext('Canvas1');
+						this.context1 = context1;
+						context1.setStrokeStyle('#EEEEEE');
+						context1.setLineWidth(this.caculateX * 20);
+						context1.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, 2 * Math.PI, true);
+						context1.stroke();
+						context1.draw();
+
+						var context2 = uni.createCanvasContext('Canvas2');
+						this.context2 = context2;
+						context2.setStrokeStyle('#EEEEEE');
+						context2.setLineWidth(this.caculateX * 20);
+						context2.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, 2 * Math.PI, false);
+						context2.stroke();
+						context2.draw();
+					});
 			}
-		})
-	},
-	onShow() {
-		
-		
+		});
 	},
+	onShow() {},
 	methods: {
 		goodsBankDolist() {
-			this.$api.goodsBankDolist({
-				goodsId:this.id
-			}).then(res => {
-				console.log(res)
-				this.bankList = res.data.data;
-			})
+			this.$api
+				.goodsBankDolist({
+					goodsId: this.id
+				})
+				.then(res => {
+					console.log(res);
+					this.bankList = res.data.data;
+				});
 		},
 		goodsBankList() {
-			this.$api.goodsBankList({
-				goodsId:this.id
-			}).then(res => {
-				console.log(res)
-				this.bankList = res.data.data;
-			})
+			this.$api
+				.goodsBankList({
+					goodsId: this.id
+				})
+				.then(res => {
+					console.log(res);
+					this.bankList = res.data.data;
+				});
 		},
-		goodsBankQuestionNum(){
+		goodsBankQuestionNum() {
 			this.$api.goodsBankQuestionNum(this.id).then(res => {
-				this.goodsCount = res.data.data
-				
-				this.context1.beginPath()
-				this.context1.setStrokeStyle("#32D74B")
-				this.context1.setFillStyle('#32D74B')
-				this.context1.setTextAlign('center')
-				this.context1.setLineCap('round')
-				this.context1.setFontSize(this.caculateX * 32)
-				this.context1.fillText((this.goodsCount.rightNum / this.goodsCount.totalNum * 100).toFixed(2)+'%', this.caculateX * 90, this.caculateX * 90, this.caculateX * 180)
-				this.context2.save()
-				this.context2.translate(this.caculateX * 90, this.caculateX * 90)
-				this.context2.rotate(-90 * Math.PI/180);
-				this.context1.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, (this.goodsCount.rightNum / this.goodsCount.totalNum) * 2 * Math.PI, false)
-				this.context2.restore()
-				this.context1.stroke()
-				this.context1.draw()
-				
-				this.context2.beginPath()
-				this.context2.setStrokeStyle("#007AFF")
-				this.context2.setFillStyle("#007AFF")
-				this.context2.setTextAlign('center')
-				this.context2.setLineCap('round')
-				this.context2.setFontSize(this.caculateX * 32)
-				this.context2.fillText((this.goodsCount.doNum / this.goodsCount.totalNum * 100).toFixed(2)+'%', this.caculateX * 90, this.caculateX * 90, this.caculateX * 180)
-				this.context2.save()
-				this.context2.translate(this.caculateX * 90, this.caculateX * 90)
-				this.context2.rotate(-90 * Math.PI/180);
-				this.context2.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, (this.goodsCount.doNum / this.goodsCount.totalNum) * 2 * Math.PI, false)
-				this.context2.restore()
-				this.context2.stroke()
-				this.context2.draw()
-			})
+				this.goodsCount = res.data.data;
+
+				this.context1.beginPath();
+				this.context1.setStrokeStyle('#32D74B');
+				this.context1.setFillStyle('#32D74B');
+				this.context1.setTextAlign('center');
+				this.context1.setLineCap('round');
+				this.context1.setFontSize(this.caculateX * 32);
+				this.context1.fillText(
+					((this.goodsCount.rightNum / this.goodsCount.totalNum) * 100).toFixed(2) + '%',
+					this.caculateX * 90,
+					this.caculateX * 90,
+					this.caculateX * 180
+				);
+				this.context2.save();
+				this.context2.translate(this.caculateX * 90, this.caculateX * 90);
+				this.context2.rotate((-90 * Math.PI) / 180);
+				this.context1.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, (this.goodsCount.rightNum / this.goodsCount.totalNum) * 2 * Math.PI, false);
+				this.context2.restore();
+				this.context1.stroke();
+				this.context1.draw();
+
+				this.context2.beginPath();
+				this.context2.setStrokeStyle('#007AFF');
+				this.context2.setFillStyle('#007AFF');
+				this.context2.setTextAlign('center');
+				this.context2.setLineCap('round');
+				this.context2.setFontSize(this.caculateX * 32);
+				this.context2.fillText(((this.goodsCount.doNum / this.goodsCount.totalNum) * 100).toFixed(2) + '%', this.caculateX * 90, this.caculateX * 90, this.caculateX * 180);
+				this.context2.save();
+				this.context2.translate(this.caculateX * 90, this.caculateX * 90);
+				this.context2.rotate((-90 * Math.PI) / 180);
+				this.context2.arc(this.caculateX * 90, this.caculateX * 90, this.caculateX * 80, 0, (this.goodsCount.doNum / this.goodsCount.totalNum) * 2 * Math.PI, false);
+				this.context2.restore();
+				this.context2.stroke();
+				this.context2.draw();
+			});
 		},
-		clickModule(id,index) {
-			
-			
-			if(this.bankList[index].list) {
-				this.$set(this.bankList[index],'showList',!this.bankList[index].showList)
+		clickModule(id, index) {
+			if (this.bankList[index].list) {
+				this.$set(this.bankList[index], 'showList', !this.bankList[index].showList);
 				return;
 			}
-			
-			this.$api.goodsChapterDolist({
-				moduleExamId:id
-			}).then(res => {
-				this.$set(this.bankList[index],'showList',true)
-				this.$set(this.bankList[index],'list',res.data.data)
-				 
-			})
+
+			this.$api
+				.goodsChapterDolist({
+					moduleExamId: id
+				})
+				.then(res => {
+					this.$set(this.bankList[index], 'showList', true);
+					this.$set(this.bankList[index], 'list', res.data.data);
+				});
 		},
-		changeItem(index1,id,type) {
-			
-			if(type == 1) {
-				if(this.bankList[index1].list[index2].list) {
-					this.$set(this.bankList[index1].list[index2],'showList',!this.bankList[index1].list[index2].showList)
+		changeItem(index1, id, type) {
+			if (type == 1) {
+				if (this.bankList[index1].list[index2].list) {
+					this.$set(this.bankList[index1].list[index2], 'showList', !this.bankList[index1].list[index2].showList);
 					return;
 				}
-				
-				this.$api.goodsExamList({
-					chapterExamId:id
-				}).then(res => {
-					
-					this.$set(this.bankList[index1].list[index2],'showList',true)
-					this.$set(this.bankList[index1].list[index2],'list',res.data.data)
-					
-					 
-				})
-				
-			} else if(type == 2) {
-				if(this.bankList[index1].list) {
-					this.$set(this.bankList[index1],'showList',!this.bankList[index1].showList)
+
+				this.$api
+					.goodsExamList({
+						chapterExamId: id
+					})
+					.then(res => {
+						this.$set(this.bankList[index1].list[index2], 'showList', true);
+						this.$set(this.bankList[index1].list[index2], 'list', res.data.data);
+					});
+			} else if (type == 2) {
+				if (this.bankList[index1].list) {
+					this.$set(this.bankList[index1], 'showList', !this.bankList[index1].showList);
 					return;
 				}
-				
-				this.$api.goodsExamDolist({
-					chapterExamId:id
-				}).then(res => {
-					
-					this.$set(this.bankList[index1],'showList',true)
-					this.$set(this.bankList[index1],'list',res.data.data)
-					
-					 
-				})
+
+				this.$api
+					.goodsExamDolist({
+						chapterExamId: id
+					})
+					.then(res => {
+						this.$set(this.bankList[index1], 'showList', true);
+						this.$set(this.bankList[index1], 'list', res.data.data);
+					});
 			}
-			
-			
-			
 		}
 	}
 };
 </script>
-<style >
-	page{
-		background-color: #EAEEF1;
-	}
+<style>
+page {
+	background-color: #eaeef1;
+}
 </style>
 <style lang="scss" scope>
-	
-	.top {
-		margin:16rpx;
-		border-radius: 16rpx;
-		background:#fff;
-		padding:24rpx;
-		.title {
-			font-size: 24rpx;
-			line-height: 24rpx;
-			color: #333333;
-			
-			text {
-				font-size: 30rpx;
-				color: #999999;
-			}
+.top {
+	margin: 16rpx;
+	border-radius: 16rpx;
+	background: #fff;
+	padding: 24rpx;
+	.title {
+		font-size: 24rpx;
+		line-height: 24rpx;
+		color: #333333;
+
+		text {
+			font-size: 30rpx;
+			color: #999999;
 		}
-		
-		.circle-wrap {
-			margin-top:20rpx;
-			
-			.circle-list {
-				display: flex;
-				
-				.item {
-					flex:1;
-					padding-left:30rpx;
-					
-					canvas {
-						margin:0 auto;
-						width:180rpx;
-						height:180rpx;
-					}
-					
-					.text {
-						text-align: center;
-						margin-top:16rpx;
-						font-size: 24rpx;
-						color: #333333;
-					}
+	}
+
+	.circle-wrap {
+		margin-top: 20rpx;
+
+		.circle-list {
+			display: flex;
+
+			.item {
+				flex: 1;
+				padding-left: 30rpx;
+
+				canvas {
+					margin: 0 auto;
+					width: 180rpx;
+					height: 180rpx;
 				}
-				.numbers {
-					display: flex;
-					color:#999999;
+
+				.text {
+					text-align: center;
+					margin-top: 16rpx;
 					font-size: 24rpx;
-					align-items: center;
-					justify-content: center;
-					flex-direction: column;
-					
-					.blue {
-						margin-bottom:40rpx;
-						color: #007AFF;
-					}
+					color: #333333;
+				}
+			}
+			.numbers {
+				display: flex;
+				color: #999999;
+				font-size: 24rpx;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+
+				.blue {
+					margin-bottom: 40rpx;
+					color: #007aff;
 				}
 			}
 		}
 	}
-	
-	.courseName{
-		white-space:nowrap;
-		overflow:hidden;
-		text-overflow:ellipsis; 
-	}
-	
-	
-	.moduleItem{
-		height: 80rpx;
-		color: #333333;
-		font-size: 32rpx;
-		line-height: 80rpx;
-		font-weight: bold;
-		display: flex;
-		justify-content: space-between;
-	
-	}
-	
-	.icon_up{
-		width: 32rpx;
-		height: 32rpx;
-	}
-	
-	.title-list {
-		background: #EAEEF1;
-		padding:16rpx 16rpx 124rpx;
-		.content {
-			
-			.list {
-				background:#fff;
-				margin-bottom:30rpx;
+}
+
+.courseName {
+	font-size: 24rpx;
+	color: #666;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.moduleItem {
+	height: 80rpx;
+	color: #333333;
+	font-size: 32rpx;
+	line-height: 80rpx;
+	font-weight: bold;
+	display: flex;
+	justify-content: space-between;
+}
+
+.icon_up {
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.title-list {
+	background: #eaeef1;
+	padding: 16rpx 16rpx 124rpx;
+	.content {
+		.list {
+			background: #fff;
+			margin-bottom: 30rpx;
+			overflow: hidden;
+			border-radius: 16rpx;
+			padding: 10rpx 16rpx;
+
+			.module {
+				font-size: 30rpx;
+				color: #333333;
+
+				.icon {
+					margin-right: 10rpx;
+				}
+			}
+
+			.section {
+				font-size: 30rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				white-space: nowrap;
 				overflow: hidden;
-				border-radius: 16rpx;
-				padding:10rpx 16rpx;
-				
-				.module {
-					font-size: 30rpx;
-					color: #333333;
-					
-					.icon {
-						margin-right:10rpx;
+				text-overflow: ellipsis;
+				margin: 20rpx 0;
+				display: flex;
+				align-items: center;
+			}
+
+			.article {
+				padding: 14rpx 0 10rpx;
+				display: flex;
+				align-items: center;
+				margin-left: 40rpx;
+				font-size: 24rpx;
+				color: #666666;
+				border-bottom: 1rpx solid #eeeeee;
+
+				.flex-auto {
+					font-size: 26rpx;
+					flex: 1;
+					margin-right: 30rpx;
+
+					&:nth-last-of-type(1) {
+						border: 0;
 					}
-				}
-				 
-				.section {
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: bold;
-					color: #333333;
-					white-space:nowrap;
-					overflow:hidden;
-					text-overflow:ellipsis; 
-					margin: 20rpx 0;
-					display: flex;
-					align-items: center;
-				}
-				
-				.article {
-					padding:14rpx 0 10rpx;
-					display: flex;
-					align-items: center;
-					margin-left:40rpx;
-					font-size: 24rpx;
-					color: #666666;
-					border-bottom: 1rpx solid #EEEEEE;
-					
-					.flex-auto {
+
+					.desc {
+						width: 480rpx;
+						padding: 0 14rpx;
+						margin-top: 20rpx;
+						height: 40rpx;
+						border: 1px solid #eeeeee;
+						border-radius: 16rpx;
 						font-size: 26rpx;
-						flex:1;
-						margin-right:30rpx;
-						
-						
-						&:nth-last-of-type(1) {
-							border:0;
+						display: flex;
+						align-items: center;
+
+						.blue {
+							font-size: 26rpx;
+							color: #007aff;
 						}
-						
-						.desc {
-							width: 480rpx;
-							padding:0 14rpx;
-							margin-top:20rpx;
-							height: 40rpx;
-							border: 1px solid #EEEEEE;
-							border-radius: 16rpx;
+						.green {
 							font-size: 26rpx;
-							display: flex;
-							align-items: center;
-							
-							.blue {
-								font-size: 26rpx;
-								color:#007AFF;
-							}
-							.green {
-								font-size: 26rpx;
-								color:#32D74B;
-							}
+							color: #32d74b;
 						}
 					}
-					
-						
-					.btn {
-						width: 96rpx;
-						height: 48rpx;
-						line-height: 48rpx;
-						text-align: center;
-						color:#fff;
-						font-size: 30rpx;
-						border-radius:24rpx;
-						background: #007AFF;
-						// margin-left:36rpx;
-						border-radius: 24rpx;
-					}
+				}
+
+				.btn {
+					width: 96rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					text-align: center;
+					color: #fff;
+					font-size: 30rpx;
+					border-radius: 24rpx;
+					background: #007aff;
+					// margin-left:36rpx;
+					border-radius: 24rpx;
 				}
 			}
 		}
 	}
-	
-	
-	
+}
 </style>

pages2/verify/input2.vue

@@ -211,7 +211,7 @@ export default {
 				keyValue: JSON.stringify(objs)
 			};
 			if (self.remarkStatus) {
-				data.id = self.id;
+				datas.id = self.id;
 				self.$api.editbaseprofileStamp(datas).then(res => {
 					if (res.data.code === 200) {
 						self.$method.showToast('提交成功');