diff --git a/api/HistoryExam/index.js b/api/HistoryExam/index.js
new file mode 100644
index 0000000..633c9d4
--- /dev/null
+++ b/api/HistoryExam/index.js
@@ -0,0 +1,9 @@
+import request from "../request.js"
+
+export function paging(data) {
+	return request({
+		url: `/exam/api/user/exam/my-paging`,
+		method: 'post',
+		data
+	})
+}
\ No newline at end of file
diff --git a/api/request.js b/api/request.js
index 88db997..9caa217 100644
--- a/api/request.js
+++ b/api/request.js
@@ -9,7 +9,7 @@ var request = function(config) {
 			url: baseurl + config.url,
 			data: config.data,
 			method: config.method,
-			timeout: 10000,
+			timeout: 30000,
 			header: {
 				...config.header,
 				token: uni.getStorageSync('examh5token')
diff --git a/pages.json b/pages.json
index 97e272d..4781be0 100644
--- a/pages.json
+++ b/pages.json
@@ -4,6 +4,12 @@
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
+			"path": "pages/register/register",
+			"style": {
+				"navigationBarTitleText": "注册账号",
+				"enablePullDownRefresh": false
+			}
+		}, {
 			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "登录",
@@ -24,12 +30,6 @@
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		}, {
-			"path": "pages/register/register",
-			"style": {
-				"navigationBarTitleText": "注册账号",
-				"enablePullDownRefresh": false
-			}
 		}, {
 			"path": "pages/forgotPassword/forgotPassword",
 			"style": {
@@ -42,6 +42,18 @@
 				"navigationBarTitleText": "新增考试",
 				"enablePullDownRefresh": false
 			}
+		}, {
+			"path": "pages/HistoryExam/HistoryExam",
+			"style": {
+				"navigationBarTitleText": "历史考试成绩"
+			}
+		},
+		{
+			"path" : "pages/SimulatedExam/SimulatedExam",
+			"style" : 
+			{
+				"navigationBarTitleText" : "模拟考试"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/HistoryExam/HistoryExam.vue b/pages/HistoryExam/HistoryExam.vue
new file mode 100644
index 0000000..9ec5d20
--- /dev/null
+++ b/pages/HistoryExam/HistoryExam.vue
@@ -0,0 +1,179 @@
+<template>
+	<view class="">
+		<view class="app">
+			<view class="items" v-if="list.length>0">
+				<view class="item" v-for="(item,index) in list">
+					<view class="title">
+						<view class="text">
+							{{item.title}}
+						</view>
+						<view class="image">
+							<image src="../../static/jinbi.png" mode=""></image>
+							<span v-if="item.examFee&&item.examFee>=0">
+								{{item.examFee}}
+							</span>
+							<span v-else>
+								0
+							</span>
+						</view>
+					</view>
+					<view class="time" style="margin-top: 20rpx;">
+						考试费用：{{item.examFee}}
+					</view>
+					<view class="time">
+						考试日期：{{item.startDate}}至{{item.endDate}}
+					</view>
+					<view class="time">
+						考试时间：{{item.startTime}}至{{item.endTime}}
+					</view>
+					<view class="time">
+						考试时长：{{item.totalTime}}分钟
+					</view>
+					<view class="time">
+						考试类型：{{item.examType==1?"模拟考试":""}}
+						{{item.examType==2?"正式考试":""}}
+						{{item.examType==3?"补考":""}}
+					</view>
+					<view class="time" style="color: #EA706A;font-weight:600">
+						考试成绩：{{item.maxScore}}
+					</view>
+					<view class="time">
+						试卷总分：{{item.totalScore}}
+					</view>
+					<view class="time">
+						考试人员：{{user.name}}
+					</view>
+					<view class="time">
+						身份证：{{user.cardNo}}
+					</view>
+					<view class="time">
+						手机号：{{user.phone}}
+					</view>
+				</view>
+			</view>
+			<view v-else class="" style="margin-top: 100rpx;">
+				<u-empty text="暂无历史考试成绩" mode="list" icon-size='240' font-size='32'></u-empty>
+			</view>
+			<u-toast ref="uToast" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		paging
+	} from '@/api/HistoryExam/index.js'
+	export default {
+		data() {
+			return {
+				user: uni.getStorageSync('examh5user'),
+				list: [], //项目list
+				total: 0,
+			}
+		},
+		methods: {
+			//考试报名
+			signup() {
+				uni.navigateTo({
+					url: "/pages/addexam/addexam"
+				})
+			},
+			//list请求
+			info() {
+				paging({
+					examType: 0,
+					current: 1,
+					size: 200,
+				}).then(res => {
+					this.list = res.data.records
+				})
+			},
+		},
+		onLoad() {},
+		onShow() {
+			this.info();
+		},
+		onReachBottom() { //下滑加载
+			if (this.list.length >= this.total) {} else {}
+		},
+		onPullDownRefresh() { //下拉刷新
+			this.info();
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+	}
+</script>
+
+<style lang="scss">
+	.navbar-right {
+		color: #fff;
+		padding-right: 20rpx;
+	}
+
+	.app {
+		padding: 0;
+
+		.items {
+			width: 96%;
+			margin: 20rpx auto;
+
+			.item {
+				margin: 10rpx auto;
+				background-color: #fff;
+				box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				border-radius: 5rpx;
+				padding: 10rpx;
+				width: 100%;
+				position: relative;
+				color: #333333;
+				font-size: 30rpx;
+				padding-bottom: 60rpx;
+
+				.time {
+					font-size: 30rpx;
+				}
+
+				.title {
+					line-height: 100rpx;
+					border-bottom: 1rpx solid #E6E6E6;
+					font-size: 38rpx;
+					color: #333333;
+					position: relative;
+					height: 100rpx;
+
+					.text {
+						height: 100%;
+						overflow: hidden; //超出的文本隐藏
+						display: -webkit-box;
+						-webkit-line-clamp: 1; // 超出多少行
+						-webkit-box-orient: vertical;
+						width: calc(100% - 170rpx);
+					}
+
+					.image {
+						position: absolute;
+						right: 0%;
+						top: 50%;
+						transform: translateY(-50%);
+						display: inline-block;
+						font-size: 30rpx;
+						color: #EA706A;
+
+						span {
+							display: inline-block;
+							width: 100rpx;
+						}
+
+						image {
+							transform: translateY(20%);
+							width: 40rpx;
+							height: 40rpx;
+							padding-right: 10rpx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/SimulatedExam/SimulatedExam.vue b/pages/SimulatedExam/SimulatedExam.vue
new file mode 100644
index 0000000..8c3b35f
--- /dev/null
+++ b/pages/SimulatedExam/SimulatedExam.vue
@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/pages/examlist/examlist.vue b/pages/examlist/examlist.vue
index 629821b..7655cbd 100644
--- a/pages/examlist/examlist.vue
+++ b/pages/examlist/examlist.vue
@@ -34,6 +34,11 @@
 					<view class="time">
 						考试时长：{{item.totalTime}}分钟
 					</view>
+					<view class="time">
+						考试类型：{{item.examType==1?"模拟考试":""}}
+						{{item.examType==2?"正式考试":""}}
+						{{item.examType==3?"补考":""}}
+					</view>
 					<view class="time">
 						试卷总分：{{item.totalScore}}
 					</view>
@@ -49,7 +54,7 @@
 				</view>
 			</view>
 			<view v-else class="" style="margin-top: 100rpx;">
-				<u-empty text="暂无工单" mode="list" icon-size='240' font-size='32'></u-empty>
+				<u-empty text="暂无考试" mode="list" icon-size='240' font-size='32'></u-empty>
 			</view>
 			<u-toast ref="uToast" />
 		</view>
diff --git a/pages/register/register.vue b/pages/register/register.vue
index 423d5a9..0af8424 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -35,6 +35,33 @@
 				</span>
 			</view>
 		</view>
+		<view class="user">
+			<view class="title">
+				密码
+			</view>
+			<view class="item">
+				<span>密码：</span>
+				<span class='addition'>
+					<u-input placeholder="请输入密码" v-model="personInfo.password" type="password" :password-icon="true" />
+				</span>
+			</view>
+			<view class="item">
+				<span>重复密码：</span>
+				<span class='addition'>
+					<u-input placeholder="请再次输入密码" v-model="personInfo.newpassword" type="password"
+						:password-icon="true" />
+				</span>
+			</view>
+			<!-- <view class="item">
+						<view class="lefttext">
+							验证码
+						</view>
+						<input class="righttext" style='left:23%' type="text" placeholder="" maxlength="6" v-model="verification" />
+						<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
+							{{getCodeText}}
+						</view>
+					</view> -->
+		</view>
 		<view class="user">
 			<view class="title">
 				教育背景
@@ -137,33 +164,6 @@
 				</span>
 			</view>
 		</view>
-		<view class="user">
-			<view class="title">
-				密码
-			</view>
-			<view class="item">
-				<span>密码：</span>
-				<span class='addition'>
-					<u-input placeholder="请输入密码" v-model="personInfo.password" type="password" :password-icon="true" />
-				</span>
-			</view>
-			<view class="item">
-				<span>重复密码：</span>
-				<span class='addition'>
-					<u-input placeholder="请再次输入密码" v-model="personInfo.newpassword" type="password"
-						:password-icon="true" />
-				</span>
-			</view>
-			<!-- <view class="item">
-						<view class="lefttext">
-							验证码
-						</view>
-						<input class="righttext" style='left:23%' type="text" placeholder="" maxlength="6" v-model="verification" />
-						<view class="obtaincode" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">
-							{{getCodeText}}
-						</view>
-					</view> -->
-		</view>
 		<view class="priceback">
 			<view class="queren" @tap='register'>注册</view>
 			<view class="switch" @tap='gologin'>
diff --git a/pages/user/user.vue b/pages/user/user.vue
index b2cab40..8e166ad 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -17,6 +17,12 @@
 			</view>
 		</view>
 		<view class="bottomitems">
+			<view class="bottomitem" @tap='goHistoryExam'>
+				<image src="../../static/qbgd.png" mode=""></image>
+				<view class="">
+					历史考试成绩
+				</view>
+			</view>
 			<view class="bottomitem" @tap='goremove'>
 				<image src="../../static/shezhi.png" mode=""></image>
 				<view class="">
@@ -65,6 +71,11 @@
 					url: '/pages/login/login'
 				})
 			},
+			goHistoryExam() {
+				uni.navigateTo({
+					url: '/pages/HistoryExam/HistoryExam'
+				})
+			},
 			//退出账号
 			goremove() {
 				let that = this
diff --git a/static/qbgd.png b/static/qbgd.png
new file mode 100644
index 0000000..2785428
Binary files /dev/null and b/static/qbgd.png differ