diff --git a/config/baseUrl.js b/config/baseUrl.js
index 2b66856..4ed5682 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,8 +6,8 @@ if (process.env.NODE_ENV === 'development') {
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
 	// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
-	baseUrl = "https://api.nuttyreading.com/"; // 线上正式
-	// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
+	// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
+	baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
 	// baseUrl = "http://192.168.110.110:9200/pb/";
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index fd43874..91774cf 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -4,35 +4,37 @@
 		<z-nav-bar title="班级详情"></z-nav-bar>
 		<view class="mainContent" v-if="thisClass.id">
 			<view :class="['classStatus',
-			this.thisClass.state == 0 ? 'daikai' :'',
-			this.thisClass.state == 1 ? 'xuexizhong' :'',
-			this.thisClass.state == 2 ? 'yijieban' :''
+			thisClass.state == '0' ? 'daikai' :'',
+			thisClass.state == '1' ? 'xuexizhong' :'',
+			thisClass.state == '2' ? 'yijieban' :'',
+			thisClass.state == '3' ? 'kaoshizhou' :''
 			]">
 				班级状态：{{getClassStatus}}
 			</view>
 			<view class="className">
 				<h3>{{thisClass.title}}</h3>
-				<text class="tuichu" v-if="thisClass.state == 0 && isHave" @click="outClass()">退出班级</text>				
-			</view>			
+				<text class="tuichu" v-if="thisClass.state == 0 && isHave" @click="outClass()">退出班级</text>
+			</view>
 			<view class="otherItems flex_box">
-				<view v-if="thisClass.state == 0">
-					<text class="ciyao">创建日期</text><text
-						class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
+				<view v-if="thisClass.state == '0'">
+					<text class="ciyao">创建日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
 				</view>
-				<view v-if="thisClass.state == 1">
-					<text class="ciyao">开班日期</text><text
-						class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
+				<view v-if="thisClass.state == '1' || thisClass.state == '3' ">
+					<text class="ciyao">开班日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
 				</view>
-				<view v-if="thisClass.state == 2">
-					<text class="ciyao">结班日期</text><text
-						class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
+				<view v-if="thisClass.state == '2'">
+					<text class="ciyao">结班日期</text><text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
 				</view>
+				<!-- <view >
+					<text class="ciyao">教学时长</text><text
+						class="mainTxt">{{classModel.days}} 天</text>
+				</view> -->
 				<view><text class="ciyao">班级类型</text>
 					<text class="mainTxt" v-if="classModel.type == '0'">普通小班</text>
 					<text class="mainTxt" v-if="classModel.type == '1'">联合班</text>
 					<text class="mainTxt" v-if="classModel.type == '2'">精英班</text>
 				</view>
-				<view><text class="ciyao">人数</text><text
+				<view><text class="ciyao">学员人数</text><text
 						class="mainTxt">{{students.length}}/{{thisClass.number}}人</text></view>
 				<view><text class="ciyao">管理成员</text><text class="mainTxt" @click="seeManager">点击查看</text></view>
 			</view>
@@ -41,9 +43,9 @@
 					<view class="titles flex_box">
 						<text>表现分</text><uni-icons type="help" size="18" color="#fff" @click="clickHelp"></uni-icons>
 					</view>
-				</view>			
+				</view>
 				<view :class="['otherItems' ,'flex_box' ,'userScore']">
-					
+
 					<view v-if="classModel.isTask == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">作业得分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.task0Score}}</i>分</text>
@@ -59,13 +61,13 @@
 					<view v-if="classModel.isQuestion == 1" :class="['ite', blankNumber < 3 ? 'flex_box' : '']">
 						<text class="ciyao">思考题分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i>分</text>
-					</view>	
+					</view>
 					<!-- <view v-if="classModel.isExam == 1 && thisClass.state == '2'">
 						<text class="ciyao">考试分</text>
 						<text class="ciyao"><i class="mainTxt PM_font">{{performanceScore.questionScore}}</i>分</text>
 					</view> -->
 				</view>
-				<view class="optionsBox" >
+				<view class="optionsBox">
 					<view class=" ">
 						<view class="">
 							<view class="gotoExams" @click="goTest">
@@ -74,16 +76,18 @@
 							<view class="">
 								<text>卷面成绩：60分</text><text class="small_btn retake border_radius_10">再考一次</text>
 							</view>
-						</view>					
+						</view>
 					</view>
 					<view class="chengji">
-						<view >恭喜您获得<text class="greenScore">A证</text>， <text class="small_btn border_radius_10 zhengshu">查看证书</text></view>
+						<view>恭喜您获得<text class="greenScore">A证</text>， <text
+								class="small_btn border_radius_10 zhengshu">查看证书</text></view>
 						<view style="margin-top: 20rpx; text-align: center;">很遗憾，您的成绩未达标</view>
-						<view class="" style="margin-top: 20rpx; text-align: center;"> 
+						<view class="" style="margin-top: 20rpx; text-align: center;">
 							<text class="small_btn chongxiu border_radius_10">加入新班级重修</text>
 						</view>
-						<view style="margin-top: 20rpx;">总成绩为：<text class="scoreNumber greenScore">90</text>分 <text class="c999">（50考试分+40平时表现分）</text></view>
-						
+						<view style="margin-top: 20rpx;">总成绩为：<text class="scoreNumber greenScore">90</text>分 <text
+								class="c999">（50考试分+40平时表现分）</text></view>
+
 					</view>
 				</view>
 			</view>
@@ -129,28 +133,58 @@
 					</view>
 				</view>
 				<!-- 班内问答 -->
-				<view class="" v-if=" tabId == '1'">
+				<!-- <view class="" v-if=" tabId == '1'">
 					班内问答
-				</view>
+				</view> -->
 				<!-- 班内同学 -->
 				<view class="classMateBox" v-show="students.length> 0 && tabId == '2'">
 					<view class="newBox flexbox">
-						<view :class="['item','flexbox']" v-for="(item, index) in students" :key="index">
+						<view :class="['item']" v-for="(item, index) in students" :key="index">
 							<!-- <view class="imgcontainer" :style="{backgroundImage:surl(item.image)}"> -->
-							<view class="classmateImg">
-								<image v-if="item.student.avatar != null && item.student.avatar != ''"
-									:src="item.student.avatar" mode="aspectFit"></image>
-								<image v-else src="/static/icon/morenAvavter.png" mode="aspectFit"></image>
+							<view class="flexbox">
+								<view class="classmateImg">
+									<image v-if="item.student.avatar != null && item.student.avatar != ''"
+										:src="item.student.avatar" mode="aspectFit"></image>
+									<image v-else src="/static/icon/morenAvavter.png" mode="aspectFit"></image>
+								</view>
+								<view class="textItems flex_box">
+									<text class="txt555"
+										v-if="item.student.nickname != null && item.student.nickname != ''">
+										{{item.student.nickname}}
+									</text>
+									<text v-else>匿名用户</text>
+								</view>
 							</view>
-							<view class="textItems flex_box">
-								<text class="txt555"
-									v-if="item.student.nickname != null && item.student.nickname != ''">
-									{{item.student.nickname}}
-								</text>
-								<text v-else>匿名用户</text>
+							<view class="" v-if="thisClass.state == '3' || thisClass.state == '2'">
+								<view class="scoreBox flex_box   ">
+									<view class="item1">
+										<view class="ciyao">
+											平时成绩
+										</view>
+										<text class="score">{{item.student.score.peacetimeScore}}</text>
+									</view>
+									<template v-if="classModel.isExam == 1 && thisClass.state == '2'">
+										<template v-if="item.student.score.testScore.length == 0">
+											<view class="item1">
+												<view class="ciyao">
+													考试成绩
+												</view>
+												<text class="score">0</text>
+											</view>
+										</template>
+										<template v-else>
+											<view class="item1">
+												<view class="ciyao">
+													考试成绩
+												</view>
+												<text class="score">{{item.student.score.testScoreNumber}} </text>
+											</view>											
+										</template>
+									</template>
+								</view>
 							</view>
-
 						</view>
+
 					</view>
 				</view>
 				<view class="" v-show="students.length == 0 && tabId == '2'">
@@ -198,11 +232,12 @@
 											<view :class="[item.zhedie ? '' : 'zhedie']">
 												{{item.content}}
 											</view>
-											
+
 										</view>
 										<view class="leve3">
 											<view class="tips flex_box">
-												<view class="btn1" @click.stop="changeZheDie(item, index)">{{item.zhedie ? '收起' : '展开'}}</view>
+												<view class="btn1" @click.stop="changeZheDie(item, index)">
+													{{item.zhedie ? '收起' : '展开'}}</view>
 												<!-- <text>发布者：{{item.createUser.nickname != null && item.createUser.nickname != '' ? item.createUser.nickname : '匿名用户'}}</text> -->
 												<text style="" class="date">日期：{{item.createTime}}</text>
 											</view>
@@ -215,13 +250,16 @@
 												v-show="tijiaoTitleId == 2 && myExperience == 1 && item.scoreSuccess == 0"
 												@click.stop="editMyXinde(item)">修改</text>
 										</view>
-										<template v-if="roleCode.includes('0')">
-										<view class="leve3" v-show="item.reply && tijiaoTitleId != 2">
-											<text>已提交答案</text>
-										</view>
-										<view class="leve3 no" v-show="!item.reply && tijiaoTitleId != 2">
-											<text>未提交答案 点击开始答题</text>
-										</view>
+										<template v-if="roleCode.includes('0') && isHave">
+											<view class="leve3" v-show="item.reply && tijiaoTitleId != 2">
+												<text>已提交答案</text>
+											</view>
+											<view class="leve3 no" v-show="!item.reply && tijiaoTitleId != 2 && thisClass.state == '1'">
+												<text>未提交答案 点击开始答题</text>
+											</view>
+											<view class="leve3 cantAnswer" v-show="!item.reply && tijiaoTitleId != 2 && (thisClass.state == '2' || thisClass.state == '3')">
+												<text>未作答 已不可作答</text>
+											</view>
 										</template>
 									</view>
 								</view>
@@ -257,7 +295,7 @@
 					<text class="adminName">副班长：</text>
 					<view class="personbox" v-if="admins.dmonitor.user != null">
 						<text>{{admins.dmonitor.user.nickname != null && admins.dmonitor.user.nickname != '' ? admins.dmonitor.user.nickname : '匿名用户'}}</text>
-						
+
 						<!-- <text>({{admins.dmonitor.user.tel}})</text> -->
 					</view>
 					<text v-else>暂未设置</text>
@@ -300,6 +338,8 @@
 </template>
 
 <script>
+	const classData = require('@/data/classInfoMan.json')
+	const studentList = require('@/data/manStudentsList.json')
 	import $http from '@/config/requestConfig.js';
 	import {
 		mapState
@@ -307,7 +347,7 @@
 	export default {
 		data() {
 			return {
-
+				showAlert: false, // 是否显示考试周
 				horizontal: 'right',
 				vertical: 'bottom',
 				direction: 'vertical',
@@ -336,7 +376,7 @@
 
 				thisClass: {},
 				students: [],
-				tabId:'3',
+				tabId: '3',
 				curTagIndex: 0,
 				scrollable: false,
 				pPage: 0,
@@ -372,6 +412,24 @@
 						id: '2'
 					}
 				],
+				// 考试周及结班
+				tabList03: [{
+						name: '历史提交',
+						id: '3'
+					},
+					// {
+					// 	name: '班内讨论',
+					// 	id: '1'
+					// }, 
+					{
+						name: '班内学员',
+						id: '2'
+					},
+					{
+						name: '班内课程',
+						id: '0'
+					}
+				],
 				admins: {
 					list: [],
 					monitor: {},
@@ -397,7 +455,7 @@
 				isDirector: false, // 是主任
 				isHave: false,
 				showMan: false,
-				tijiaoTitleList:[],
+				tijiaoTitleList: [],
 				defaultTijiaoTitleList: [{
 						name: '班内作业',
 						id: '0'
@@ -421,15 +479,15 @@
 					task0Score: 0,
 					questionScore: 0
 				},
-				roleCode:[],
-				firstLoad:true, // 是否是第一次请求
-				blankNumber:0
+				roleCode: [],
+				firstLoad: true, // 是否是第一次请求
+				blankNumber: 0
 			}
 		},
 		onLoad(e) {
 			uni.hideTabBar();
 			this.classId = e.id
-			
+			this.getUserRole()
 			this.getUserInfo()
 			uni.$on('refreshData', () => {
 				console.log('开始刷新列表数据');
@@ -457,10 +515,10 @@
 			this.getList()
 			uni.stopPullDownRefresh()
 		},
-		onShow() {			
+		onShow() {
 			this.getClassInfo()
 			this.getScore()
-			
+
 		},
 		computed: {
 			...mapState(["userInfo"]),
@@ -476,11 +534,63 @@
 					case '2':
 						_roleName = '已结班';
 						break;
+					case '3':
+						_roleName = '考试周';
+						break;
 				}
 				return _roleName
 			},
+
+			tabList() {
+				var list = []
+				if (this.thisClass.state == '0') {
+					list = this.tabList01
+				} else if (this.thisClass.state == '1') {
+					list = this.tabList02
+				} else {
+					list = this.tabList03
+				}
+				return list
+			},
+			// 获得提交项目的tab
+			getTijiaoTitleList() {
+				var _list = []
+				if (this.classModel.isTask == 1) {
+					_list.push(this.defaultTijiaoTitleList[0])
+				}
+				if (this.classModel.isMedicalcase == 1) {
+					_list.push(this.defaultTijiaoTitleList[1])
+				}
+				if (this.classModel.isExperience == 1) {
+					_list.push(this.defaultTijiaoTitleList[2])
+				}
+				// return _list
+				this.tijiaoTitleList = _list
+				this.tijiaoTitleId = this.tijiaoTitleList[0].id
+				// this.tabId = 
+			},
+			getBlankNumber() {
+				this.blankNumber = 0
+				if (this.classModel.isTask == 1) {
+					this.blankNumber++
+				}
+				if (this.classModel.isMedicalcase == 1) {
+					this.blankNumber++
+				}
+				if (this.classModel.isExperience == 1) {
+					this.blankNumber++
+				}
+				if (this.classModel.isQuestion == 1) {
+					this.blankNumber++
+				}
+				// if(this.classModel.isExam == 1){
+				// 	this.blankNumber++
+				// }	
+			}
+		},
+		methods: {
 			// 查询考试成绩
-			getPaperScore(){
+			getPaperScore() {
 				console.log('获取卷面成绩');
 				// $http.request({
 				// 		url: "common/class/getUserRole",
@@ -505,87 +615,53 @@
 				// 		})
 				// 	});
 			},
-			tabList() {
-				var list = []
-				if (this.thisClass.state == 0) {
-					list = this.tabList01
-				} else {
-					list = this.tabList02
-				}
+			// 考试周和结班状态下，学员的信息
+			async getStudentScoreList() {
+				var list = undefined
+				await this.$http
+					.post('book/user/info/' + this.userInfo.id)
+					.then(res => {
+						// this.userMsg = res.user
+						list = studentList
+					}).catch(e => {
+						list = []
+					});
 				return list
 			},
-			// 获得提交项目的tab
-			getTijiaoTitleList(){
-				var _list = []
-				if(this.classModel.isTask == 1){
-					_list.push(this.defaultTijiaoTitleList[0])
-				}
-				if(this.classModel.isMedicalcase == 1){
-					_list.push(this.defaultTijiaoTitleList[1])
-				}
-				if(this.classModel.isExperience == 1){
-					_list.push(this.defaultTijiaoTitleList[2])
-				}
-				// return _list
-				this.tijiaoTitleList = _list 
-				this.tijiaoTitleId = this.tijiaoTitleList[0].id
-				// this.tabId = 
-			},
-			getBlankNumber(){
-				this.blankNumber = 0
-				if(this.classModel.isTask == 1){
-					this.blankNumber++
-				}
-				if(this.classModel.isMedicalcase == 1){
-					this.blankNumber++
-				}
-				if(this.classModel.isExperience == 1){
-					this.blankNumber++
-				}
-				if(this.classModel.isQuestion == 1){
-					this.blankNumber++
-				}
-				// if(this.classModel.isExam == 1){
-				// 	this.blankNumber++
-				// }	
-			}
-		},
-		methods: {
-			
-			goTest(){
+			goTest() {
 				uni.navigateTo({
-					url:`/pages/miniClass/test?classId=${this.thisClass.id}`
+					url: `/pages/miniClass/test?classId=${this.thisClass.id}`
 				})
 			},
-			changeZheDie(item, index){
-				
+			changeZheDie(item, index) {
+
 				this.taskList[index].zhedie = !this.taskList[index].zhedie
 			},
 			// 获取用户身份
-			getUserRole(){	
-								$http.request({
-										url: "common/class/getUserRole",
-										method: "POST",
-										data: {
-											"classId": this.classId
-										},
-										header: { //默认 无 说明：请求头
-											'Content-Type': 'application/json'
-										},
-									})
-									.then((res) => {
-										uni.hideLoading()
-										console.log('res获取身份信息',res);										
-										this.roleCode = res.result
-									}).catch(e => {
-										uni.hideLoading()
-										this.roleCode = []
-										uni.showToast({
-											title: '获取身份信息失败',
-											icon: 'error'
-										})
-									});
-					
+			getUserRole() {
+				$http.request({
+						url: "common/class/getUserRole",
+						method: "POST",
+						data: {
+							"classId": this.classId
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then((res) => {
+						uni.hideLoading()
+						console.log('res获取身份信息', res);
+						this.roleCode = res.result
+					}).catch(e => {
+						uni.hideLoading()
+						this.roleCode = []
+						uni.showToast({
+							title: '获取身份信息失败',
+							icon: 'error'
+						})
+					});
+
 			},
 			// 查询平时表现分
 			getScore() {
@@ -643,7 +719,7 @@
 						url: `/pages/miniClass/xindeDetail?id=${item.id}`
 					})
 					return
-				}				
+				}
 				uni.navigateTo({
 					url: `/pages/miniClass/taskDetail?id=${item.id}&classState=${this.thisClass.state}`
 				})
@@ -754,7 +830,7 @@
 					return
 				}
 				this.tijiaoTitleId = item.id
-				console.log('e班内提交子按钮',this.tijiaoTitleId);
+				console.log('e班内提交子按钮', this.tijiaoTitleId);
 				this.pPage = 0
 				this.taskList = []
 				this.myExperience = 0
@@ -777,7 +853,7 @@
 			},
 			// 添加心得
 			addXinde(url, id, modeType) {
-				uni.navigateTo({					
+				uni.navigateTo({
 					url: `${url}?classId=${this.thisClass.id}&type=${modeType}&sort=undefined`
 				});
 			},
@@ -945,10 +1021,10 @@
 			outClass(userId) {
 				let that = this
 				var _useId = undefined
-				var _txt = ''				
+				var _txt = ''
 				_useId = this.userInfo.id
 				_txt = '您即将退出当前班级，退出班级后，在本班级提交的作业、医案、心得都将被删除，是否继续？'
-				
+
 
 				uni.showModal({
 					title: '提示',
@@ -1008,7 +1084,7 @@
 					url: `/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}`
 				})
 			},
-			getClassInfo() {				
+			async getClassInfo() {
 				uni.showLoading({
 					title: '正在加载'
 				})
@@ -1022,14 +1098,24 @@
 							'Content-Type': 'application/json'
 						},
 					})
-					.then(res => {
+					.then(async res => {
 						this.refresh = false
 						if (res.code == 0) {
+							res = classData // 测试数据	
 							this.isHave = res.result.isJoin
 							this.thisClass = res.result.class
-							if(this.thisClass.state == '0'){
+							if (!this.showAlert && this.thisClass.state == '3') {
+								uni.showModal({
+									title: '提示',
+									content: '您好，当前教学进度已进入考试周，请尽快完成最终的笔试考试，如在结班（endTime）之前未完成考试，则卷面成绩记为0分',
+									confirmText: '好的',
+									showCancel: false
+								})
+								this.showAlert = true
+							}
+							if (this.thisClass.state == '0') {
 								this.tabId = '0'
-							}else{
+							} else {
 								this.tabId = '3'
 							}
 							this.admins.list = res.result.admins
@@ -1063,21 +1149,28 @@
 
 							this.classModel = res.result.classModel
 							this.courses = res.result.courses
-							this.students = res.result.students
+
+							if (this.thisClass.state == '3' || this.thisClass.state == '2') {
+								// 考试周 结班状态下的
+								this.students = await this.getStudentScoreList()
+								console.log('students', this.students);
+							} else {
+								this.students = res.result.students
+							}
 							this.refresh = true
-							var ss =  this.getTijiaoTitleList
+							var ss = this.getTijiaoTitleList
 							if (this.thisClass.state != 0) {
 								this.pPage = 0
 								this.taskList = []
-								if(this.firstLoad){
+								if (this.firstLoad) {
 									this.firstLoad = false
-									this.tijiaoTitleId = this.tijiaoTitleList[0].id				
-									
+									this.tijiaoTitleId = this.tijiaoTitleList[0].id
+
 								}
 								this.getList()
 							}
 							var dd = this.getBlankNumber
-							if(this.thisClass.state == '2'){   // 结班状态下再查询卷面成绩
+							if (this.thisClass.state == '2') { // 结班状态下再查询卷面成绩
 								this.getPaperScore()
 							}
 						}
@@ -1139,6 +1232,12 @@
 		background-image: linear-gradient(90deg, #258feb 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
 	}
 
+	.kaoshizhou {
+		background-image: linear-gradient(90deg, #ffaa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
+
+		// background-image: linear-gradient(-90deg, # 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
+	}
+
 	.xuexizhong {
 		background-image: linear-gradient(90deg, #55aa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
 	}
@@ -1221,13 +1320,39 @@
 			}
 		}
 	}
-	.zhengshu{color: #ffaa7f; border:1px solid #ffaa7f}
-	.chongxiu{color: #00aaff; border:1px solid #00aaff}
-	.greenScore{color: #55aa00;}
-	.blueScore{color: #00aaff;}
-	.redScore{color: #ff8a8c;}
-	.scoreNumber{font-size: 60rpx;}
-.chengji{padding-top: 20rpx; margin-top: 20rpx; border-top: 1px solid #eee; }
+
+	.zhengshu {
+		color: #ffaa7f;
+		border: 1px solid #ffaa7f
+	}
+
+	.chongxiu {
+		color: #00aaff;
+		border: 1px solid #00aaff
+	}
+
+	.greenScore {
+		color: #55aa00;
+	}
+
+	.blueScore {
+		color: #00aaff;
+	}
+
+	.redScore {
+		color: #ff8a8c;
+	}
+
+	.scoreNumber {
+		font-size: 60rpx;
+	}
+
+	.chengji {
+		padding-top: 20rpx;
+		margin-top: 20rpx;
+		border-top: 1px solid #eee;
+	}
+
 	.manBtnBox {
 		justify-content: center;
 
@@ -1316,7 +1441,12 @@
 					}
 
 					.date {}
-.btn1{color: $themeColor; font-size: 30rpx;}
+
+					.btn1 {
+						color: $themeColor;
+						font-size: 30rpx;
+					}
+
 					.btn {
 						border: 1px solid $themeColor;
 						margin-top: 20rpx;
@@ -1331,12 +1461,18 @@
 					color: #ff9277;
 					text-align: center;
 				}
+				.leve3.cantAnswer {
+					color: #999;
+					text-align: center;
+				}
 			}
 		}
 	}
-.zhedie{
+
+	.zhedie {
 		@include bov(2);
 	}
+
 	.nobg {
 		background-color: transparent !important;
 	}
@@ -1365,9 +1501,15 @@
 
 	.userScore {
 		text-align: center;
-		.ite.flex_box{ align-items: end;
-			.ciyao{margin-right: 10rpx;}
+
+		.ite.flex_box {
+			align-items: end;
+
+			.ciyao {
+				margin-right: 10rpx;
+			}
 		}
+
 		.mainTxt {
 			font-size: 50rpx;
 			color: $themeColor;
@@ -1410,6 +1552,27 @@
 		}
 	}
 
+	.scoreBox { border-top: 1px solid #eee; padding-top: 10rpx;
+	justify-content: space-around;
+		align-items: center;
+		margin-top: 20rpx;
+		text-align: center;
+		background-color: #fff;
+		
+		font-size: 26rpx;
+		
+		.ciyao {
+			color: #999;
+		}
+
+		.score {
+			color: #258feb;
+			font-weight: bold;
+			font-size: 36rpx;
+		}
+		
+	}
+
 	.classMateBox {
 		.newBox {
 			justify-content: space-between;
@@ -1567,7 +1730,7 @@
 	}
 
 	.tijiaoTitle {
-		justify-content:space-around;
+		justify-content: space-around;
 		margin-bottom: 20rpx;
 
 		text {
@@ -1662,5 +1825,9 @@
 			background-color: #f4a2a6;
 		}
 	}
-	.retake{border: 1px solid #5049cf; color: #5049cf;}
+
+	.retake {
+		border: 1px solid #5049cf;
+		color: #5049cf;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue
index 5d544e5..2d516fa 100644
--- a/pages/miniClass/classInfoMan.vue
+++ b/pages/miniClass/classInfoMan.vue
@@ -11,7 +11,8 @@
 			<view :class="['classStatus',
 			thisClass.state == '0' ? 'daikai' :'',
 			thisClass.state == '1' ? 'xuexizhong' :'',
-			thisClass.state == '2' ? 'yijieban' :''
+			thisClass.state == '2' ? 'yijieban' :'',
+			thisClass.state == '3' ? 'kaoshizhou' :''
 			]">
 				{{getClassStatus}}
 			</view>
@@ -36,11 +37,8 @@
 				</view>
 			</view>
 
-
 			<view class="pingfenBox">
 				<!-- 功能按钮 -->
-				<!-- 待开班按钮 -->
-
 				<!-- 已开班按钮 -->
 				<view class="optionsBtn" v-if="thisClass.state != '2'">
 					<!-- 待开班主任 -->
@@ -104,7 +102,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="flex_box" v-if="thisClass.state == '1'">
+					<view class="flex_box" v-if="thisClass.state == '1' || thisClass.state == '3'">
 						<view class="item fabuhomework" @click="goTaskListForWait('0')"
 							v-if="thisClass.state == '1' && classModel.isTask == 1">
 							<text>作业列表</text>
@@ -113,20 +111,24 @@
 							v-if="thisClass.state == '1' && classModel.isMedicalcase == 1">
 							<text>医案列表</text>
 						</view>
-						<view class="item setBanewei" v-if="thisClass.state != '2'"
+						<view class="item setBanewei" v-if="thisClass.state == '1'"
 							@click="goSetAdmin('/pages/miniClass/memberSet')">
 							<text>设置班委</text>
 						</view>
+						<!-- && thisClass.showOverBtn -->
 						<view class="item overClass" @click="changeClassStatu('2')"
-							v-if="thisClass.state == '1' && thisClass.showOverBtn && (roleCode.includes('1') || roleCode.includes('2'))">
+							v-if="classModel.isExam == 1 &&  thisClass.state == '3' && (roleCode.includes('1') || roleCode.includes('2'))">
+							<text>结班</text>
+						</view>
+						
+						<view class="item overClass" @click="changeClassStatu('2')"
+							v-if="classModel.isExam == 1 && thisClass.state == '1' && thisClass.showOverBtn && (roleCode.includes('1') || roleCode.includes('2'))">
+							<!-- (无考试) -->
 							<text>结班</text>
 						</view>
-
 					</view>
 				</view>
-				<view class="line1" v-if="thisClass.state == '1'">
-
-				</view>
+				<view class="line1" v-if="thisClass.state == '1' || thisClass.state == '3'"></view>
 				<!--  作业批改 -->
 				<class-infoWork-blank v-if="thisClass.state != '0'" :thisClass="thisClass" :classModel="classModel"
 					:roleCode="roleCode"></class-infoWork-blank>
@@ -144,51 +146,109 @@
 							<uni-section class="mb-10 nobg xueyuanTitle" title="班内学员" type="line" sub-title="">共
 								{{students.length}} 名学员</uni-section>
 						</view>
-						<view class="flex_box tips">
-							<view class="item flex_box">
-								<span class=""></span><text>普通用户</text>
-							</view>
-							<view class="item flex_box">
-								<span class="superVip"></span><text>超级VIP</text>
-							</view>
-							<view class="item flex_box">
-								<span class="wumenVip"></span><text>医学VIP</text>
-							</view>
-							<view class="item flex_box">
-								<span class="zmVip"></span><text>国学VIP</text>
-							</view>
-						</view>
+						<view class=" tips">
+							<view class="flex_box">
+								<view class="item flex_box">
+									<span class=""></span><text>普通用户</text>
+								</view>
+								<view class="item flex_box">
+									<span class="superVip"></span><text>超级VIP</text>
+								</view>
+								<view class="item flex_box">
+									<span class="wumenVip"></span><text>医学VIP</text>
+								</view>
+								<view class="item flex_box">
+									<span class="zmVip"></span><text>国学VIP</text>
+								</view>
+							</view>							
+							<view v-if="thisClass.state == '2'" class=" zhiliang flex_box flex_between align-items_box" style="margin-top: 20rpx;">
+								<view class="">
+									<text>A证：</text>
+									<text>20 人</text>
+								</view>
+								<view class="">
+									<text>B证：</text>
+									<text>20 人</text>
+								</view>
+								<view class="">
+									<text>不合格：</text>
+									<text>20 人</text>
+								</view>
+							</view>							
+						</view>						
 						<view class="newBox">
-							<view :class="['item','flexbox',
+							<view :class="['item',
 											item.student.vip == '1' ? 'superVip' : '',
 											item.student.vip == '2' ? 'wumenVip' : '', 
 											item.student.vip == '3' ? 'zmVip' : '',
 											thisStudent.student && thisStudent.student.id == item.student.id ? 'cur' : ''
 											]" v-for="(item, index) in students" :key="index" @click="clickStudent(item)">
 								<!-- <view class="imgcontainer" :style="{backgroundImage:surl(item.image)}"> -->
-								<view class="classmateImg">
-									<image v-if="item.student.avatar != null && item.student.avatar != ''"
-										:src="item.student.avatar" mode="aspectFit"></image>
-									<image v-else src="/static/icon/morenAvavter.png" mode="aspectFit"></image>
-								</view>
-								<view :class="['textItems','flex_box']">
-									<text class="txt555"
-										v-if="item.student.nickname != null && item.student.nickname != ''">
-										{{item.student.nickname}}
-										<template>
-											<text>（{{item.student.tel}}）</text>
-										</template>
-									</text>
-									<text class="txt555" v-else>
-										匿名用户
-									</text>
-									<text @click.stop="outClass(item.student.id)" class="outBtn"
-										v-if="thisClass.state != '2'">踢出班级</text>
-									<!-- <text class="userType" v-if="item.student.vip == '1'">超级VIP用户</text>
+								<view class="flexbox align-items_box">
+									<view class="classmateImg">
+										<image v-if="item.student.avatar != null && item.student.avatar != ''"
+											:src="item.student.avatar" mode="aspectFit"></image>
+										<image v-else src="/static/icon/morenAvavter.png" mode="aspectFit"></image>
+									</view>
+									<view :class="['textItems','flex_box']">
+										<text class="txt555"
+											v-if="item.student.nickname != null && item.student.nickname != ''">
+											{{item.student.nickname}}
+											<template>
+												<text>（{{item.student.tel}}）</text>
+											</template>
+										</text>
+										<text class="txt555" v-else>
+											匿名用户
+										</text>										
+										<text @click.stop="outClass(item.student.id)" class="outBtn"
+											v-if="thisClass.state != '2' && thisClass.state != '3'">踢出班级</text>
+										<!-- <text class="userType" v-if="item.student.vip == '1'">超级VIP用户</text>
 												<text class="userType" v-if="item.student.vip == '2' ">医学VIP用户</text>
 												<text class="userType" v-if="item.student.vip == '3' ">国学VIP用户</text> -->
+									</view>
+								</view>
+								<view class="" v-if="thisClass.state == '3' || thisClass.state == '2'">
+									<view class="scoreBox flex_box flex_between border_radius_10 ">
+										<view class="">
+											<view class="ciyao">
+												平时成绩
+											</view>
+												<text class="score">{{item.student.score.peacetimeScore}}</text>											
+										</view>
+									<template v-if="classModel.isExam == 1">
+										<template v-if="item.student.score.testScore.length == 0">
+											<view class="" v-if="thisClass.state == '3'">
+												<view class="" style="color: #ff9496;">
+													未考试
+												</view>
+											</view>
+											<view class="" v-if="thisClass.state == '2'">
+												<view class="ciyao">
+													考试成绩
+												</view>
+												<text class="score">0</text>
+											</view>
+										</template>
+										<template v-else >
+											<view class="" v-if="thisClass.state == '3'">
+												<view class="" style="color: #55aa7f;">
+													等待公布分数
+												</view>
+											</view>
+											<view v-if="thisClass.state == '2'">
+												<view class="ciyao">
+													考试成绩
+												</view>
+												<text class="score">{{item.student.score.testScoreNumber}}</text>
+											</view>																				
+										</template>
+									</template>
+									<!--   -->
+									<view v-if="classModel.isExam == 1 && thisClass.state == '2'" :class="['PM_font','zhengshu',item.student.score.certificateType == 'A' ? 'Azheng' : 'Bzheng']"
+									 ></view>
+									</view>
 								</view>
-
 							</view>
 						</view>
 					</view>
@@ -203,15 +263,18 @@
 							<text class="ciyao">创建日期</text>
 							<text class="mainTxt">{{thisClass.createTime.substring(0,10)}}</text>
 						</view>
-						<view class="itt" v-if="thisClass.state == 1">
+						<view class="itt" v-if="thisClass.state == 1 || thisClass.state == 3">
 							<text class="ciyao">开班日期</text>
 							<text class="mainTxt">{{thisClass.startTime.substring(0,10)}}</text>
 						</view>
-
 						<view class="itt" v-if="thisClass.state == 2">
 							<text class="ciyao">结班日期</text>
 							<text class="mainTxt">{{thisClass.endTime.substring(0,10)}}</text>
 						</view>
+						<view class="itt">
+							<text class="ciyao">教学时长</text>
+							<text class="mainTxt">{{classModel.days}} 天</text>
+						</view>
 						<view class="itt"><text class="ciyao">班级类型</text>
 							<text class="mainTxt" v-if="classModel.type == '0'">普通小班</text>
 							<text class="mainTxt" v-if="classModel.type == '1'">联合班</text>
@@ -237,7 +300,9 @@
 
 			</view>
 		</view>
-
+<view>
+			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
+		</view>
 		<!-- 管理弹出 -->
 		<u-popup key="1" :show="showMan" :round="10" @close="closeManager">
 			<view class="guanli">
@@ -307,6 +372,40 @@
 				<view class="item">
 					<b>课程购买情况：</b><br />{{thisStudent.buyState}}
 				</view>
+				<view class="scoreBox flex_box flex_between border_radius_10 " >
+					<view class="">
+						<view class="ciyao">
+							平时成绩
+						</view>
+							<text class="score">{{thisStudent.student.score.peacetimeScore}}</text>											
+					</view>
+				<template v-if="classModel.isExam == 1">
+					<template v-if="thisStudent.student.score.testScore.length == 0">
+						<view class="">
+							<view class="">
+								未参加考试
+							</view>
+						</view>
+					</template>
+					<template v-else >
+					<view class="" v-for="(item1, index1) in thisStudent.student.score.testScore">
+						<view class="ciyao">
+							{{index1 == 0 ? '一' : '二'}}次考试成绩
+						</view>
+						<view class="flex_box flex_center" @click.stop="seePaper(item1.testPaperId)">
+							<text class="score">{{item1.score}}</text>
+							<view class="seePaper">
+								<image src="../../static/icon/testPaperIcon.png" mode="widthFix" ></image>
+							</view>
+						</view>
+						
+					</view>										
+					</template>
+				</template>
+				<!--  && thisClass.state == '2' -->
+				<!-- <view v-if="classModel.isExam == 1" :class="['PM_font','zhengshu',thisStudent.student.score.certificateType == 'A' ? 'Azheng' : 'Bzheng']"
+				 ></view> -->
+				</view>
 			</view>
 		</u-popup>
 		<!-- <view class="fabBox">
@@ -317,6 +416,8 @@
 </template>
 
 <script>
+	const classData = require('@/data/classInfoMan.json')
+	const studentList = require('@/data/manStudentsList.json')
 	import {
 		ref,
 		onMounted
@@ -329,6 +430,7 @@
 	export default {
 		data() {
 			return {
+				scrollTop: 0,
 				horizontal: 'right',
 				vertical: 'bottom',
 				direction: 'vertical',
@@ -425,7 +527,15 @@
 				homeWorkList: [],
 				thisStudent: {},
 				showStudentBlank: false,
-
+				showAlert: false, // 是否显示考试周
+				bgiStyle: {
+					background: '#fff'
+				},
+				iconStyle: {
+					fontSize: '40rpx',
+					fontWeight: 'bold',
+					color: '#258feb',
+				},
 			}
 		},
 		onLoad(e) {
@@ -451,7 +561,9 @@
 		beforeDestroy() {
 			clearInterval(this.interval)
 		},
-
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
 		onShow() {
 			this.getClassInfo()
 			// this.roleCode = await this.getRealRole()
@@ -509,6 +621,9 @@
 					case '2':
 						_roleName = '已结班';
 						break;
+					case '3':
+						_roleName = '考试周';
+						break;
 				}
 				return _roleName
 			},
@@ -667,8 +782,8 @@
 					});
 			},
 			clickStudent(item) {
-				console.log('item', item);
-				this.thisStudent = item
+				console.log('item', item);				
+				this.thisStudent = item							
 				this.showStudentBlank = true
 			},
 			getUserInfo() {
@@ -836,6 +951,7 @@
 							content: '是否要提前结班？',
 							success(res) {
 								if (res.confirm) {
+									// return
 									that.opClass(statusCode)
 								} else {
 									return
@@ -843,12 +959,27 @@
 							},
 						})
 					} else {
+						console.log('this.statusCode', statusCode);
+						// return
 						that.opClass(statusCode)
 					}
 					// that.opClass(statusCode)
 				}
 
 			},
+			// 考试周和结班状态下，学员的信息
+			async getStudentScoreList() {
+				var list = undefined
+				await this.$http
+					.post('book/user/info/' + this.userInfo.id)
+					.then(res => {
+						// this.userMsg = res.user
+						list = studentList
+					}).catch(e => {
+						list = []
+					});
+				return list
+			},
 			// 班级操作
 			opClass(statusCode) {
 				$http.request({
@@ -886,6 +1017,9 @@
 			taskEdit(item) {
 				console.log('taskEdit'.item);
 			},
+			seePaper(val){
+				console.log('点击了');
+			},
 			// 退出班级 // 踢出班级
 			outClass(userId) {
 				let that = this
@@ -964,8 +1098,19 @@
 						console.log('res--------', this.classId, res, );
 						this.refresh = false
 						if (res.code == 0) {
-							// this.isHave = res.result.isJoin
+
+							res = classData // 测试数据							
+
 							this.thisClass = res.result.class
+							if (!this.showAlert && this.thisClass.state == '3') {
+								uni.showModal({
+									title: '提示',
+									content: '您好，当前教学进度已进入考试周，请敦促评分员尽快完成评分工作，考试周结束后将无法评分，感谢您对吴门医述教务的大力支持。',
+									confirmText: '好的',
+									showCancel: false
+								})
+								this.showAlert = true
+							}
 							this.classModel = res.result.classModel
 							// this.thisClass.showOverBtn = false
 							if (this.thisClass.state == '1') {
@@ -988,7 +1133,7 @@
 								console.log('off70...天数', off70, off70miniSecond)
 							}
 
-							
+
 							this.thisClass.homeWorkNumber = 4
 							if (res.result.classModel.days > 0) {
 								this.thisClass.homeWorkNumber = Math.ceil(res.result.classModel.days / 7)
@@ -1025,7 +1170,14 @@
 
 
 							this.courses = res.result.courses
-							this.students = res.result.students
+							if (this.thisClass.state == '3' || this.thisClass.state == '2') {
+								// 考试周 结班状态下的
+								this.students = await this.getStudentScoreList()
+								// console.log('students', this.students);
+							} else {
+								this.students = res.result.students
+							}
+
 							this.refresh = true
 							if (this.thisClass.state == 0) {
 								this.homeWorkList = await this.getHomeWorkLength()
@@ -1174,7 +1326,7 @@
 		margin-bottom: 10rpx;
 		// border-bottom: 1px solid #eee; 
 		padding-bottom: 10rpx;
-		margin-top: 20rpx;
+		// margin-top: 20rpx;
 
 		.flex_box {
 			justify-content: space-between;
@@ -1212,7 +1364,7 @@
 
 	.tips {
 		padding: 20rpx 10rpx;
-		background-color: #eee;
+		background-color: #fff;
 		border-radius: 10rpx;
 		font-size: 24rpx;
 		color: #666;
@@ -1245,6 +1397,10 @@
 		background-image: linear-gradient(-90deg, #55aa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
 	}
 
+	.kaoshizhou {
+		background-image: linear-gradient(-90deg, #ffaa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
+	}
+
 	.yijieban {
 		background-image: linear-gradient(-90deg, #999 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100%);
 	}
@@ -1358,7 +1514,9 @@
 		}
 
 	}
-
+.zhiliang{
+	font-size: 28rpx;
+}
 	.showMore {
 		width: 100%;
 		text-align: center;
@@ -1450,7 +1608,7 @@
 
 	.classMateBox {
 		.zmVip {
-			background-image: linear-gradient(-60deg, #53966a 0%, #e1feef 50%, #e1feef 100%);
+			background-image: linear-gradient(-30deg, #7fd59c 0%, #e1feef 50%, #e1feef 100%);
 
 			.outBtn {
 				color: #fff !important;
@@ -1459,7 +1617,7 @@
 		}
 
 		.wumenVip {
-			background-image: linear-gradient(-60deg, #578df0 0%, #f1f4fd 50%, #f1f4fd 100%);
+			background-image: linear-gradient(-30deg, #71aaf0 0%, #f1f4fd 50%, #f1f4fd 100%);
 
 			.outBtn {
 				color: #fff !important;
@@ -1468,7 +1626,7 @@
 		}
 
 		.superVip {
-			background-image: linear-gradient(-60deg, #965af0 0%, #fdf0ed 50%, #fdf0ed 100%);
+			background-image: linear-gradient(-30deg, #a576c7 0%, #fdf0ed 30%, #fdf0ed 100%);
 
 			.outBtn {
 				color: #fff !important;
@@ -1478,6 +1636,10 @@
 
 		.newBox {
 			flex-wrap: wrap;
+
+			.item {
+				border: 1px solid #fff;
+			}
 		}
 
 		.item {
@@ -1516,7 +1678,7 @@
 		}
 
 		.item.cur {
-			border: 2px solid #55aa00;
+			border: 1px solid #55aa00;
 		}
 	}
 
@@ -1699,7 +1861,19 @@
 		font-size: 30rpx;
 		margin-top: 20rpx;
 	}
-
+	.zhengshu{width: 80rpx; height: 80rpx; background-size: contain;}
+	.Azheng{background-image: url(@/static/icon/Az.png);}
+	.Bzheng{background-image: url(@/static/icon/Bz.png);}
+.scoreBox{
+	align-items: center;
+	margin-top: 20rpx;
+	text-align: center; background-color: #fff; padding: 20rpx;
+	.ciyao{color: #999;}
+	.score{color: #258feb; font-weight: bold; font-size: 36rpx;}
+	.seePaper{width: 50rpx; height: 50rpx; 
+	image{width: 100%; height: 100%;}
+	 }
+}
 	.className {
 		padding: 30rpx 0;
 		position: relative;
diff --git a/pages/miniClass/test.vue b/pages/miniClass/test.vue
index cad5713..0eacbfa 100644
--- a/pages/miniClass/test.vue
+++ b/pages/miniClass/test.vue
@@ -131,7 +131,7 @@
 			console.log('this.endTime',this.endTime.getTime());
 		},
 		beforeDestroy() {
-			if(!this.isOvertime){ // 如果中途退出就把成绩记为0
+			if(!this.isOvertime){ // 如果中途退出
 				this.giveZero()
 			}
 			
@@ -144,7 +144,7 @@
 				var maxNumber = 0
 				var minNumber = 0
 				if(this.nowPart == 1){
-					maxNumber = this.nowPart + 8
+					maxNumber = this.nowPart + 7
 					minNumber = 1					
 				}else{
 					minNumber = (this.nowPart - 1) * 8
@@ -172,15 +172,16 @@
 			// 倒计时结束 （超时）
 			timeup(){
 				this.isOvertime = true
+				this.sumitAnswer()
 				let that = this
 				uni.showModal({
 					title:'提示',
-					content:"考试结束，您未在规定时间内交卷，本次成绩为0分",
+					content:"考试结束，系统已为您自动交卷",
 					confirmText:'知道了',
 					showCancel:false,
 					success: (res) => {
 						if (res.confirm) {
-						that.goToClass()		
+						// that.goToClass()		
 								}
 					}
 				})
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 1c234a8..8c573c0 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -38,11 +38,7 @@
 					<text>吴门医述</text>
 				</div>
 			</view>
-		</view>		
-		<view class="" @click="onPageJump('/pages/miniClass/test')" style="height: 100rpx; line-height: 100rpx; text-align: center;">
-			去考试页面
-		</view>
-		
+		</view>	
 		<view class="newLeve2">	
 		<view class="home_nar nomargin" style="padding: 0; background-color: #fff;">
 			<view class="flexbox">
diff --git a/static/icon/Az.png b/static/icon/Az.png
new file mode 100644
index 0000000..8409685
Binary files /dev/null and b/static/icon/Az.png differ
diff --git a/static/icon/Bz.png b/static/icon/Bz.png
new file mode 100644
index 0000000..d9ff9f2
Binary files /dev/null and b/static/icon/Bz.png differ
diff --git a/static/icon/testPaperIcon.png b/static/icon/testPaperIcon.png
new file mode 100644
index 0000000..6b22cdb
Binary files /dev/null and b/static/icon/testPaperIcon.png differ