Browse Source

我的题库通

chen 3 years ago
parent
commit
e5d27de31e

+ 10 - 0
pages.json

@@ -308,6 +308,16 @@
 					}
 				}
 			},
+			{
+				"path": "bank/question_report",
+				"style": {
+					"navigationBarTitleText": "试卷报告",
+					"app-plus": {
+						"titleNView": false, //禁用原生导航栏 
+						"bounce": "none"
+					}
+				}
+			},
 			{
 				"path": "bank/questionBank",
 				"style": {

+ 1 - 1
pages/index/index.vue

@@ -27,7 +27,7 @@ export default {
 	},
 	methods: {
 		jumpBank() {
-			this.$navTo.togo('/pages2/bank/question_statistics');
+			this.$navTo.togo('/pages2/bank/question_report');
 		},
 		getDict() {
 		

+ 473 - 38
pages2/bank/questionBank.vue

@@ -1,38 +1,154 @@
 <template>
 	<view id="questionBank">
-		<view class="pageContent">
-			<view class="pad_8 titBox">
-				<view class="firstLetter">
-					<view class="leftLetters">
-						<view class="btnType">单选</view>
-						<text>1/10</text>
+		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
+			<swiper-item v-for="(bank,bankIndex) in bankList">
+				<view v-if="bank.type == 'text'" class="pageContent">
+					<view class="pad_8 titBox">
+						<view class="firstLetter">
+							<view class="leftLetters">
+								<view class="btnType">简答</view>
+								<text>{{bankIndex}}/{{bankList.length}}</text>
+							</view>
+							<view style="color: #666;font-size: 28rpx;">03:25:06</view>
+							<view class="leftLetters"></view>
+						</view>
+						<view class="titles">论述我国中央人民政府和特别行政区的关系。</view>
+					</view>
+					<view class="ans">
+						<view class="ans_input" v-if="!ques[bankIndex]">
+							<view class="top flex">
+								<image :data-index="bankIndex" class="icon" @click="chooseImg" src="/static/08-10_032.jpg" mode=""></image>
+								<view class="progress">0/4</view>
+								<view class="submit"  @click="submitAns" data-type='text' :data-bankIndex="bankIndex" >确认答案</view>
+							</view>
+							<view class="textarea">
+								<textarea v-model="bank.text" placeholder="在此输入答案"></textarea>
+							</view>
+							<view class="imgs">
+								<view class="img" v-for="(img,imgIndex) in bank.arr" >
+									<text @click="deleteImg" :data-imgIndex="imgIndex" :data-bankIndex="bankIndex">x</text>
+									<image :src="img"></image>
+								</view>
+							</view>
+						</view>
+						<view class="ans_submit answerInfos" v-if="ques[bankIndex]">
+							<view class="answerTitle">答案我的</view>
+							{{ques[bankIndex].text}}
+							<view class="imgs">
+								<image class="img" v-for="ques in ques[bankIndex].arr" :src="ques"></image>
+							</view>
+						</view>
 					</view>
-					<view style="color: #666;font-size: 28rpx;">03:25:06</view>
-					<view class="leftLetters"></view>
+					<view v-if="ques[bankIndex]">
+						<view class="pad_8 answerInfos">
+							<view class="answerTitle">答案解析</view>
+							<view class="answerContent">
+								这是官方答案解析文本,卡片高度根据内容自动调整,我实在编不出来内容了,我实在编不出来内容了,我实在编不出来内容了,我实在编不出来内容了,就这样吧。
+							</view>
+						</view>
+					</view>
+					
 				</view>
-				<view class="titles">建造师执业资格注册的有效期一般为( )年。</view>
-				<view class="">
-					<view v-for="(item, index) in bankList" :key="index" class="lisSty">
-						<text class="activeTI">{{ ast[index] }}</text>
-						{{ item.label }}
+				
+				<view v-if="bank.type == 'checkbox'" class="pageContent">
+					<view class="pad_8 titBox">
+						<view class="firstLetter">
+							<view class="leftLetters">
+								<view class="btnType">多选</view>
+								<text>{{bankIndex}}/{{bankList.length}}</text>
+							</view>
+							<view style="color: #666;font-size: 28rpx;">03:25:06</view>
+							<view class="leftLetters"></view>
+						</view>
+						<view class="titles">建造师执业资格注册的有效期一般为( )年。</view>
+						<view class="">
+							<view v-if="ques[bankIndex] ">
+								<view v-for="(item, index) in bank.arr" :key="index" 
+									 
+									class="lisSty">
+									<view :class="{right:  (item.value == ques[bankIndex]) && (ques[bankIndex] == ans[bankIndex]),wrong:(item.value == ques[bankIndex]) && (ques[bankIndex] != ans[bankIndex])}" class="activeTI">{{ ast[index] }}</view>
+									{{ item.label }}
+								</view>
+							</view>
+							<view v-if="!ques[bankIndex]">
+								<view v-for="(item, index) in bank.arr" :key="index" @click="click" :data-value="item.value" class="lisSty">
+									<text class="activeTI">{{ ast[index] }}</text>
+									{{ item.label }}
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- <view v-if="!ques[bankIndex]" class="submit_checkbox" @click="submitAns" data-type="checkbox"  :data-bankIndex="bankIndex">
+						确认答案
+					</view> -->
+					<view v-if="ques[bankIndex]">
+						<view class="pad_8 answer">
+							<view>正确答案:{{ans[bankIndex]}}</view>
+							<view>我的答案:{{ques[bankIndex]}}</view>
+						</view>
+						<view class="pad_8 answerInfos">
+							<view class="answerTitle">答案解析</view>
+							<view class="answerContent">
+								建造师执业资格注册有效期一般为3年,有效期满前3个月,持证者应到原注册管理机构办理再次注册手续。在注册有效期内,变更执业单位者,应当及时办理变更手续。
+							</view>
+						</view>
 					</view>
 				</view>
-			</view>
-			<view class="pad_8 answer">
-				<view>正确答案:C</view>
-				<view>我的答案:B</view>
-			</view>
-			<view class="pad_8 answerInfos">
-				<view class="answerTitle">答案解析</view>
-				<view class="answerContent">
-					建造师执业资格注册有效期一般为3年,有效期满前3个月,持证者应到原注册管理机构办理再次注册手续。在注册有效期内,变更执业单位者,应当及时办理变更手续。
+				
+				<view v-if="bank.type == 'radio'" class="pageContent">
+					<view class="pad_8 titBox">
+						<view class="firstLetter">
+							<view class="leftLetters">
+								<view class="btnType">单选</view>
+								<text>{{bankIndex}}/{{bankList.length}}</text>
+							</view>
+							<view style="color: #666;font-size: 28rpx;">03:25:06</view>
+							<view class="leftLetters"></view>
+						</view>
+						<view class="titles">建造师执业资格注册的有效期一般为( )年。</view>
+						<view class="">
+							<view v-if="ques[bankIndex] ">
+								<view v-for="(item, index) in bank.arr" :key="index" 
+									 
+									class="lisSty">
+									<view :class="{right:(item.value == ques[bankIndex]) && (ques[bankIndex] == ans[bankIndex]),wrong:(item.value == ques[bankIndex]) && (ques[bankIndex] != ans[bankIndex])}" class="activeTI">{{ ast[index] }}</view>
+									{{ item.label }}
+								</view>
+							</view>
+							<view v-if="!ques[bankIndex]">
+								<view v-for="(item, index) in bank.arr" :key="index" @click="click" :data-value="item.value" class="lisSty">
+									<text class="activeTI">{{ ast[index] }}</text>
+									{{ item.label }}
+								</view>
+							</view>
+							
+						</view>
+					</view>
+					<view v-if="ques[bankIndex]">
+						<view class="pad_8 answer">
+							<view>正确答案:{{ans[bankIndex]}}</view>
+							<view>我的答案:{{ques[bankIndex]}}</view>
+						</view>
+						<view class="pad_8 answerInfos">
+							<view class="answerTitle">答案解析</view>
+							<view class="answerContent">
+								建造师执业资格注册有效期一般为3年,有效期满前3个月,持证者应到原注册管理机构办理再次注册手续。在注册有效期内,变更执业单位者,应当及时办理变更手续。
+							</view>
+						</view>
+					</view>
+					
 				</view>
-			</view>
-		</view>
+			</swiper-item>
+		</swiper>
+		
+		<view class="footer-start">开始做答</view>
 		<view class="footer_btn">
-			<view>收藏</view>
+			<view @click="collect">收藏</view>
 			<view @click="openFooterTab">答题卡</view>
-			<view>交卷</view>
+			<navigator url="/pages2/bank/question_report" open-type="redirect">
+				<view>交卷</view>
+			</navigator>
+			
 		</view>
 		<u-popup v-model="show" mode="bottom" border-radius="14" height="680rpx">
 			<view class="popupView">
@@ -43,12 +159,13 @@
 				<view class="popupContent">
 					<scroll-view scroll-y="true" style="height: 506rpx;">
 						<view class="boxSty">
-							<view v-for="(item, index) in 23" :key="index" class="liListSty">{{ index + 1 }}</view>
+							<view v-for="(item, index) in bankList" :key="index" :data-index="index" @click="changeIndex" class="liListSty">{{ index + 1 }}</view>
 						</view>
 					</scroll-view>
 				</view>
 			</view>
 		</u-popup>
+		
 	</view>
 </template>
 
@@ -56,41 +173,213 @@
 export default {
 	data() {
 		return {
-			ast: ['A', 'B', 'C', 'D', 'E', 'F', 'G'],
+			current:0,
+			ast: ['A', 'B', 'C', 'D',],
+			ans:['',1,3,4,1],
+			ques:['','','','',''],
 			show: false,
 			bankList: [
 				{
-					label: '我是选项一',
-					value: 1
+					type:'text',
+					arr:[],
+					text:''
 				},
 				{
-					label: '我是选项二',
-					value: 2
+					type:'checkbox',
+					arr:[
+						{
+							label: '9',
+							value: 1,
+							checked:false,
+						},
+						{
+							label: '10',
+							value: 2,
+							checked:false,
+						},
+						{
+							label: '11',
+							value: 3,
+							checked:false,
+						},
+						{
+							label: '12',
+							value: 4,
+							checked:false,
+						}
+					],
 				},
 				{
-					label: '我是选项三',
-					value: 3
+					type:'radio',
+					arr:[{
+							label: '13',
+							value: 1
+						},
+						{
+							label: '14',
+							value: 2
+						},
+						{
+							label: '15',
+							value: 3
+						},
+						{
+							label: '17',
+							value: 4
+						}],
 				},
 				{
-					label: '我是选项四',
-					value: 4
-				}
-			]
+					type:'radio',
+					arr:[{
+							label: '13',
+							value: 1
+						},
+						{
+							label: '14',
+							value: 2
+						},
+						{
+							label: '15',
+							value: 3
+						},
+						{
+							label: '17',
+							value: 4
+						}],
+				},
+				{
+					type:'radio',
+					arr:[{
+							label: '13',
+							value: 1
+						},
+						{
+							label: '14',
+							value: 2
+						},
+						{
+							label: '15',
+							value: 3
+						},
+						{
+							label: '17',
+							value: 4
+						}],
+				}]
 		};
 	},
 	methods: {
 		openFooterTab() {
 			this.show = true;
+		},
+		hideDialog() {
+			this.showDialog = false
+		},
+		changeIndex(e) {
+			let index = e.currentTarget.dataset.index
+			
+			this.current = e.currentTarget.dataset.index
+		},
+		
+		swiperChange(e) {
+			this.current = e.detail.current;
+		},
+		
+		submit() {
+			uni.showToast({
+			    title: '交卷成功',
+			    duration: 2000,
+				icon:'none'
+			});
+			return;
+		},
+		
+		collect() {
+			uni.showToast({
+			    title: '收藏成功',
+			    duration: 2000,
+				icon:'none'
+			});
+			return;
+		},
+		
+		click(e) {
+			if(this.ques[this.current]) return;
+			let value = e.currentTarget.dataset.value;
+			this.ques[this.current] = value;
+			this.ques = Object.assign({},this.ques)
+			
+		},
+		
+		clickCheckbox(e) {
+			
+		},
+		
+		chooseImg(e) {
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['original', ], //可以指定是原图还是压缩图,默认二者都有
+				sourceType: ['album','camera'], //从相册选择
+				success: (res) => {
+					// console.log(JSON.stringify(res.tempFilePaths));
+					this.bankList[e.currentTarget.dataset.index].arr.push(res.tempFilePaths)
+					console.log(this.bankList[e.currentTarget.dataset.index])
+				}
+			})
+		},
+		
+		deleteImg(e) {
+			
+			var imgIndex = e.currentTarget.dataset.imgindex;
+			var bankIndex = e.currentTarget.dataset.bankindex;
+			
+			this.bankList[bankIndex].arr.splice(imgIndex,1)
+		},
+		
+		submitAns(e) {
+			let type = e.currentTarget.dataset.type;
+			let bankindex = e.currentTarget.dataset.bankindex;
+			
+			if(type == 'text') {
+				if(!this.bankList[bankindex].text || !this.bankList[bankindex].arr.length) {
+					uni.showToast({
+					    title: '请输入内容',
+					    duration: 2000,
+						icon:'none'
+					});
+					return
+				}
+				
+				
+				this.$set(this.ques,bankindex,{
+						arr:this.bankList[bankindex].arr,
+						text:this.bankList[bankindex].text,
+					})
+			} else if(type == 'checkbox') {
+				
+			} else {
+				if(this.ques[this.bankindex]) return;
+				let value = e.currentTarget.dataset.value;
+				this.ques[this.bankindex] = value;
+				this.ques = Object.assign({},this.ques)
+			}
+			
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+.swiper {
+	width:100%;
+	height:100vh;
+}
 .lisSty {
 	margin-bottom: 16rpx;
+	
 }
 .activeTI {
+	vertical-align: middle;
 	display: inline-block;
 	border: 1rpx solid #eee;
 	border-radius: 50rpx;
@@ -101,6 +390,17 @@ export default {
 	margin-right: 15rpx;
 	color: #666;
 	font-size: 30rpx;
+	
+	
+	&.right {
+		color:#fff;
+		background:green;
+	}
+	
+	&.wrong {
+		color:#fff;
+		background:red;
+	}
 }
 .titles {
 	margin-bottom: 24rpx;
@@ -108,6 +408,106 @@ export default {
 .titBox {
 	padding: 41rpx 25rpx 24rpx 25rpx;
 }
+
+.ans {
+	margin:8rpx 8rpx 8rpx;
+	
+	.ans_input {
+	    border-radius: 16rpx;
+		background:#fff;
+		.top {
+			border-bottom:1rpx solid #EEEEEE;
+			padding: 16rpx;
+			display: flex;
+			align-items: center;
+			
+			.icon {
+				margin-right:20rpx;
+				width: 40rpx;
+				height: 38rpx;
+			}
+			
+			.progress {
+				flex:1;
+			}
+			
+			.submit {
+				width: 168rpx;
+				height: 48rpx;
+				line-height: 48rpx;
+				text-align: center;
+				color:#fff;
+				font-size: 30rpx;
+				background: #007AFF;
+				border-radius: 24rpx;
+			}
+		}
+		
+		.textarea {
+			textarea {
+				width:100%;
+				height:287rpx;
+				padding:10rpx;
+			}
+		}
+		
+		.imgs {
+			overflow: hidden;
+			display: flex;
+			width:100%;
+			.img {
+				width: 104rpx;
+				height: 104rpx;
+				border-radius: 8rpx;
+				position:relative;
+				margin:20rpx;
+				
+				
+				text {
+					position:absolute;
+					right:-15rpx;
+					top:-15rpx;
+					width:30rpx;
+					height:30rpx;
+					text-align: center;
+					line-height: 30rpx;
+					color:#fff;
+					background:red;
+					border-radius:50%;
+				}
+				
+				image {
+					width:100%;
+					height:100%;
+				}
+			}
+		}
+	}
+	
+	.ans_submit {
+		padding:16rpx;
+		border-radius: 16rpx;
+		background:#fff;
+		
+		.imgs {
+			overflow: hidden;
+			display: flex;
+			width:100%;
+			.img {
+				width: 104rpx;
+				height: 104rpx;
+				border-radius: 8rpx;
+				position:relative;
+				margin:20rpx;
+				
+				image {
+					width:100%;
+					height:100%;
+				}
+			}
+		}
+	}
+}
 .firstLetter {
 	display: flex;
 	justify-content: space-between;
@@ -174,6 +574,34 @@ export default {
 	color: #666;
 	font-size: 30rpx;
 }
+
+.footer-start {
+	position:fixed;
+	bottom:100rpx;
+	left:50%;
+	transform: translateX(-50%);
+	width: 526rpx;
+	height: 80rpx;
+	background: rgba(0, 122, 255, 0.6);
+	color:#fff;
+	text-align: center;
+	line-height: 80rpx;
+	font-size: 30rpx;
+	border-radius: 40rpx;
+}
+
+
+.submit_checkbox {
+	margin:20rpx auto;
+	width: 526rpx;
+	height: 80rpx;
+	background: rgba(0, 122, 255, 1);
+	color:#fff;
+	text-align: center;
+	line-height: 80rpx;
+	font-size: 30rpx;
+	border-radius: 40rpx;
+}
 .footer_btn {
 	background-color: #fff;
 	z-index: 10078;
@@ -201,6 +629,12 @@ export default {
 	font-size: 32rpx;
 	float: left;
 	margin: 20rpx 23rpx;
+	
+	&.disabled {
+		border:1rpx solid #EEEEEE;
+		color:#EEEEEE;
+		background: none;
+	}
 }
 .answerInfos {
 	padding: 25rpx 25rpx 25rpx 23rpx;
@@ -214,4 +648,5 @@ export default {
 	font-size: 30rpx;
 	color: #666;
 }
+
 </style>

+ 1 - 1
pages2/bank/question_detail.vue

@@ -53,7 +53,7 @@
 					</view>
 					<view class="article" v-if="item1.showList" :class="{active:index1 == 0}" v-for="(article,index1) in item1.list">
 						施工承发包模式-施工合同与物资采购合同二
-						<navigator url="/pages2/bank/questionBankTest">
+						<navigator url="/pages2/bank/questionBank">
 							<view v-if="index1 == 0" class="btn">做题</view>
 							<view v-if="index1 == 1" class="btn">继续</view>
 							<view v-if="index1 == 2" class="btn">重做</view>

+ 275 - 0
pages2/bank/question_report.vue

@@ -0,0 +1,275 @@
+<template>
+	<view>
+		
+		<view class="top">
+			<view class="title">试卷名称可换行我也不知道最多多少个字</view>
+			<view class="desc">交卷时间:2021/10/22  17:24</view>
+			
+			<view class="box">
+				<view class="left">
+					<view>100%</view>
+					<view>正确率</view>
+					<view>不含简答/案例题</view>
+				</view>
+				<view class="right">
+					<view class="flex up">
+						<image src="/static/5-4_03.png" mode=""></image>
+						<view class="text">正确题数</view>
+						<text class="red">3</text>
+					</view>
+					<view class="flex down">
+						<image src="/static/5-4_03.png" mode=""></image>
+						<view class="text">错误题数</view>
+						<text class="green">2</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="bottom">
+			
+			<view class="circle-wrap">
+				<view class="circle-list">
+					<view class="item">
+						<view class="title">
+							试卷得分
+							<text>(不含简答和案例题)</text>
+						</view>
+						<canvas class="canvas" canvas-id="Canvas1"></canvas>
+					</view>
+					<view class="item">
+						<view class="title">
+							答题时长
+						</view>
+						<canvas  canvas-id="Canvas2"></canvas>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+export default {
+	data() {
+		return {
+			
+		};
+	},
+	onUnload() {
+		
+	},
+	computed: { ...mapGetters(['userInfo']) },
+	onLoad(option) {
+
+	},
+	onShow() {
+		uni.getSystemInfo({
+			success:(res) => {
+				var winW = res.screenWidth;
+				var winH = res.screenHeight;
+				 uni.createSelectorQuery().in(this).select('.canvas').boundingClientRect().exec((newRes)=>{  
+					  var width = newRes[0].width;
+					  var height = newRes[0].height;
+					  var caculateX = winW/750;
+					  var caculateY = winH/1334;
+					  console.log(caculateX)
+					  var context1 = uni.createCanvasContext('Canvas1')
+					  context1.setStrokeStyle("#EEEEEE")
+					  context1.setLineWidth(caculateX * 20)
+					  context1.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0, 2 * Math.PI, true)
+					  context1.stroke()
+					  context1.beginPath()
+					  context1.setStrokeStyle("#32D74B")
+					  context1.setFillStyle('#32D74B')
+					  context1.setTextAlign('center')
+					  context1.setTextBaseline('middle')
+					  context1.setLineCap('round')
+					  context1.setFontSize(caculateX * 64)
+					  context1.fillText('60', caculateX * 90, caculateX * 90, caculateX * 180)
+					  context1.setFillStyle('#999999')
+					  context1.setFontSize(caculateX * 20)
+					  context1.fillText('满分100', caculateX * 90, caculateX * 130, caculateX * 180)
+					  context1.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0,  Math.PI, true)
+					  context1.stroke()
+					  context1.draw()
+					  
+					  
+					  
+					  
+					  var context2 = uni.createCanvasContext('Canvas2')
+					  context2.setStrokeStyle("#EEEEEE")
+					  context2.setLineWidth(caculateX * 20)
+					  context2.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0, 2 * Math.PI, true)
+					  context2.stroke()
+					  context2.beginPath()
+					  context2.setStrokeStyle("#007AFF")
+					  context2.setFillStyle("#007AFF")
+					  context2.setTextAlign('center')
+					  context1.setTextBaseline('middle')
+					  context2.setLineCap('round')
+					  context2.setFontSize(caculateX * 64)
+					  context2.fillText("12'", caculateX * 90, caculateX * 90, caculateX * 180)
+					  context2.setFillStyle('#999999')
+					  context2.setFontSize(caculateX * 20)
+					  context2.fillText("限时120'", caculateX * 90, caculateX * 130, caculateX * 180)
+					  context2.arc(caculateX * 90, caculateX * 90, caculateX * 80, 0,  Math.PI, true)
+					  context2.stroke()
+					  context2.draw()
+				})  
+				
+			}
+		})
+		
+	},
+	methods: {
+		
+	}
+};
+</script>
+<style >
+	page{
+		background-color: #EAEEF1;
+	}
+</style>
+<style lang="scss" scope>
+	
+	.top {
+		margin:16rpx 16rpx 0;
+		border-radius: 16rpx;
+		padding:40rpx 24rpx 16rpx;
+		background:#fff;
+		.title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #333333;
+		}
+		
+		.desc {
+			margin-top:20rpx;
+			font-size: 24rpx;
+			color: #999999;
+		}
+		
+		.box {
+			margin-top:30rpx;
+			display: flex;
+			
+			.left {
+				width: 250rpx;
+				height: 176rpx;
+				background: #F5F5F5;
+				border-radius: 16rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+				margin-right:16rpx;
+				
+				view {
+					text-align: center;
+					
+					&:nth-of-type(1) {
+						font-size: 60rpx;
+						font-weight: bold;
+						color: #007AFF;
+					}
+					&:nth-of-type(2) {
+						font-size: 32rpx;
+						font-weight: bold;
+						color: #333333;
+					}
+					&:nth-of-type(3) {
+						font-size: 24rpx;
+						color: #999999;
+					}
+				}
+			}
+			
+			.right{
+				flex:1;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				
+				.flex {
+					background:#F5F5F5;
+					display: flex;
+					height: 80rpx;
+					align-items: center;
+					padding:0 40rpx;
+					border-radius: 16rpx;
+					
+					image {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right:28rpx;
+					}
+					
+					.text {
+						flex:1;
+						font-size: 30rpx;
+						color: #666666;
+					}
+					
+					text {
+						font-size: 48rpx;
+						color: #E12626;
+						
+						&.red {
+							color:red;
+						}
+						
+						&.green {
+							color:green;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	.bottom {
+		.circle-wrap {
+			
+			.circle-list {
+				display: flex;
+				
+				.item {
+					padding:20rpx;
+					border-radius: 16rpx;
+					background:#fff;
+					margin:16rpx;
+					flex:1;
+					
+					.title {
+						font-weight: bold;
+						font-size: 30rpx;
+						line-height: 24rpx;
+						color: #333333;
+						
+						text {
+							font-size: 20rpx;
+							color: #999999;
+						}
+					}
+					
+					canvas {
+						margin:36rpx auto 0;
+						width:180rpx;
+						height:180rpx;
+					}
+					
+					.text {
+						text-align: center;
+						margin-top:16rpx;
+						font-size: 24rpx;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+	
+</style>

+ 1 - 3
pages2/bank/question_statistics.vue

@@ -46,7 +46,7 @@
 							</view>
 						</view>
 						
-						<navigator url="/pages2/bank/questionBankTest">
+						<navigator url="/pages2/bank/questionBank">
 							<view v-if="index1 == 0" class="btn">
 								做题
 							</view>
@@ -274,12 +274,10 @@ export default {
 							.blue {
 								font-size: 26rpx;
 								color:#007AFF;
-								
 							}
 							.green {
 								font-size: 26rpx;
 								color:#32D74B;
-								
 							}
 						}
 					}