From c4841aaa782b5009363a45d406a0ece5e3894f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Sat, 30 Aug 2025 10:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=94=99=E9=A2=98=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   5 +-
 src/api/practice.js                           |   7 +-
 src/api/request.js                            |  11 +-
 src/api/wrongQuestionRecord.js                |  21 +
 src/common/imgSvg.ts                          |  21 +-
 src/components/examination/es-analysis.vue    |  70 +-
 src/components/examination/question.vue       |  34 +-
 src/components/examination/subject.vue        | 108 ++-
 src/pages.json                                |  27 +
 src/pages/courseDetail/components/comment.vue |  16 +-
 .../courseDetail/components/introduce.vue     |  27 +-
 src/pages/courseDetail/index.vue              |  57 +-
 .../coursePracticeRecordDetail.vue            |   2 +
 src/pages/examination/components/dialog.vue   |   6 +-
 src/pages/examination/components/feedback.vue |   2 +-
 src/pages/examination/index.vue               |  11 +-
 src/pages/learningTasks/details.vue           |   2 +-
 src/pages/me/index.vue                        | 159 +---
 src/pages/messageNotification/index.vue       |  59 +-
 src/pages/practice/index.vue                  | 186 +++--
 src/pages/practice/result.vue                 | 175 +++++
 .../preview/components/previewCourse.vue      |   8 +-
 src/pages/setting/index.vue                   |   6 +-
 .../components/correct.vue                    | 187 ++---
 .../components/favorites-course.vue           |  16 +-
 src/pages/wrongQuestionRecord/correct.vue     | 737 ++++++++++++++++++
 src/pages/wrongQuestionRecord/index.vue       |  65 +-
 src/pages/wrongQuestionRecord/result.vue      |  11 +
 src/pagesA.json                               |  28 +
 src/static/images/common/wc.png               | Bin 0 -> 16232 bytes
 30 files changed, 1494 insertions(+), 570 deletions(-)
 create mode 100644 src/pages/practice/result.vue
 create mode 100644 src/pages/wrongQuestionRecord/correct.vue
 create mode 100644 src/pages/wrongQuestionRecord/result.vue
 create mode 100644 src/static/images/common/wc.png

diff --git a/.env.development b/.env.development
index 97d27da0..298c7817 100644
--- a/.env.development
+++ b/.env.development
@@ -25,11 +25,12 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001'
 
 
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
-VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
-VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
+# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 
 # 王洋洋
diff --git a/src/api/practice.js b/src/api/practice.js
index 81cc6c19..fb67031d 100644
--- a/src/api/practice.js
+++ b/src/api/practice.js
@@ -6,7 +6,6 @@ export const startPracticeByCrs = (data) => {
 	return request({
 		url: base_url + '/traCrsPractice/startPracticeByCrs',
 		method: 'post',
-		toastErrors: true,
 		data
 	});
 };
@@ -16,17 +15,16 @@ export const practiceAnswer = (data) => {
 	return request({
 		url: base_url + '/traCrsPractice/practiceAnswer',
 		method: 'post',
-		toastErrors: true,
 		data
 	});
 };
 
 // 3.课程练习状态变更
-export const practiceCommit = (data) => {
+export const practiceCommit = (data, suppressErrors=true) => {
 	return request({
 		url: base_url + '/traCrsPractice/practiceCommit',
 		method: 'post',
-		toastErrors: true,
+		suppressErrors: suppressErrors,
 		data
 	});
 };
@@ -36,7 +34,6 @@ export const queryPracticeRecordByExrId = (data) => {
 	return request({
 		url: base_url + '/traCrsPractice/queryPracticeRecordByExrId',
 		method: 'post',
-		toastErrors: true,
 		data
 	});
 };
diff --git a/src/api/request.js b/src/api/request.js
index 4a45d1d3..34356a6e 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -61,8 +61,8 @@ export default function request({
 	data,
 	meta,
 	isStream,
-	suppressErrors,
-	toastErrors,
+	suppressErrors = false,
+	toastErrors = true,
 	header = {},
 	timeout = 6000,
 	baseUrl = ''
@@ -97,10 +97,9 @@ export default function request({
 				const res = response.data
 				if (res?.rtnCode === '0000') {
 					return resolve(res)
-				} else {
-					if (toastErrors) {
-						common.msg(res?.message)
-					}
+				} else if (toastErrors) {
+					// common.msg(res?.message)
+					
 				}
 				//到这里下面全是异常的处理
 				if (suppressErrors) { // 静默的接口，报错也不处理，因为下面有公共处理
diff --git a/src/api/wrongQuestionRecord.js b/src/api/wrongQuestionRecord.js
index 26e60fef..dd4e9348 100644
--- a/src/api/wrongQuestionRecord.js
+++ b/src/api/wrongQuestionRecord.js
@@ -20,3 +20,24 @@ export const mistakesCorrect = (data) => {
 		data
 	});
 };
+
+
+// 错题本id集合
+export const queryTraMistakesCollection = (data) => {
+	return request({
+		url: base_url + '/traMistakesCollection/queryTraMistakesCollection',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
+// 根据ID查题
+export const queryMistakesAnswerByMisId  = (data) => {
+	return request({
+		url: base_url + '/traMistakesCollection/queryMistakesAnswerByMisId ',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
\ No newline at end of file
diff --git a/src/common/imgSvg.ts b/src/common/imgSvg.ts
index 9e61a5c2..4dbf34f4 100644
--- a/src/common/imgSvg.ts
+++ b/src/common/imgSvg.ts
@@ -58,26 +58,11 @@ export const lockIcon = (color: string) : string => {
 };
 
 
-// 学习时长
-export const studyDurationIcon = (color: string='#62A1FF') : string => {
+// 练习退出图标
+export const practiceExitIcon = () : string => {
 	const svgXml = `
-	<svg t="1755844236249" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6935" width="64" height="64"><path d="M512 64.8C265 64.8 64.8 265.1 64.8 512c0 247 200.3 447.2 447.2 447.2 247 0 447.2-200.3 447.2-447.2C959.3 265 759 64.8 512 64.8z m177.1 546.4H465.5c-20.5 0-37.2-16.7-37.2-37.2V307.1c0-20.5 16.7-37.2 37.2-37.2s37.2 16.7 37.2 37.2v229.6H689c20.4 0 37.3 16.8 37.3 37.3 0 20.5-16.7 37.2-37.2 37.2z" fill="${color}" p-id="6936"></path></svg>
+	<svg t="1756432094912" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7026" width="32" height="32"><path d="M833.633836 551.096437 481.955218 551.096437c-16.207124 0-29.359678-13.019525-29.359678-29.322839 0-16.188704 13.057387-29.321816 29.359678-29.321816l359.371834 0-74.718749-74.719772c-11.435447-11.414981-11.473309-29.894867 0.057305-41.424458 11.453866-11.453866 30.124088-11.340279 41.407062-0.038886l109.329011 109.310591c5.555529 1.069355 10.881838 3.703345 15.196097 8.018627 6.681166 6.681166 9.468652 15.691377 8.399297 24.319895 1.069355 8.630564-1.718131 17.640776-8.399297 24.321942-4.314259 4.315282-9.640568 6.987135-15.196097 8.018627l-109.329011 109.309568c-11.281951 11.30037-29.953196 11.413957-41.407062-0.039909-11.530614-11.530614-11.491729-30.009478-0.057305-41.423435L833.633836 551.096437zM745.933425 238.32392l0-97.704253c0-43.2572-35.029818-78.230736-78.230736-78.230736l-508.36931 0c-43.181475 0-78.230736 35.011398-78.230736 78.230736l0 742.759641c0 43.256176 35.011398 78.230736 78.230736 78.230736l508.36931 0c43.181475 0 78.230736-35.050284 78.230736-78.230736l0-97.704253c0-16.188704-13.134135-29.321816-29.341259-29.321816-16.208147 0-29.341259 13.133112-29.341259 29.321816l0 78.230736c0 21.571295-17.600867 39.059598-38.925544 39.059598l-469.635123 0c-21.49557 0-38.943964-17.450441-38.943964-39.059598l0-703.852516c0-21.533432 17.600867-39.019689 38.943964-39.019689l469.635123 0c21.515013 0 38.925544 17.410532 38.925544 39.019689l0 78.269621c0 16.187681 13.133112 29.321816 29.341259 29.321816C732.79929 267.645736 745.933425 254.511601 745.933425 238.32392z" fill="#ffffff" p-id="7027"></path></svg>
 `.trim();
 	return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`;
 };
 
-// 学习次数
-export const studyFrequencyIcon = (color: string='#62A1FF') : string => {
-	const svgXml = `
-	<svg t="1755844236249" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6935" width="64" height="64"><path d="M512 64.8C265 64.8 64.8 265.1 64.8 512c0 247 200.3 447.2 447.2 447.2 247 0 447.2-200.3 447.2-447.2C959.3 265 759 64.8 512 64.8z m177.1 546.4H465.5c-20.5 0-37.2-16.7-37.2-37.2V307.1c0-20.5 16.7-37.2 37.2-37.2s37.2 16.7 37.2 37.2v229.6H689c20.4 0 37.3 16.8 37.3 37.3 0 20.5-16.7 37.2-37.2 37.2z" fill="${color}" p-id="6936"></path></svg>
-`.trim();
-	return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`;
-};
-
-// 学习时间
-export const studyTimeIcon = (color: string='#958DFF') : string => {
-	const svgXml = `
-	<svg t="1755844179673" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6630" width="64" height="64"><path d="M329.7792 282.7776c-17.2032 0-31.1808-13.9264-31.1808-31.1808V144.9472c0-17.2032 13.9264-31.1808 31.1808-31.1808 17.2032 0 31.1808 13.9264 31.1808 31.1808v106.6496c0 17.2544-13.9776 31.1808-31.1808 31.1808zM710.2976 282.7776c-17.2032 0-31.1808-13.9264-31.1808-31.1808V144.9472c0-17.2032 13.9264-31.1808 31.1808-31.1808 17.2032 0 31.1808 13.9264 31.1808 31.1808v106.6496c0 17.2544-13.9776 31.1808-31.1808 31.1808z" fill="${color}" p-id="6631"></path><path d="M800.0512 179.7632v59.4944c0 50.0224-40.5504 90.5728-90.5728 90.5728s-90.5728-40.5504-90.5728-90.5728V174.1824H420.608v65.0752c0 50.0224-40.5504 90.5728-90.5728 90.5728S239.4624 289.28 239.4624 239.2576V178.3808c-72.4992 16.64-126.6176 81.5104-126.6176 159.0784V727.04c0 90.1632 73.1136 163.2768 163.2768 163.2768H757.76c90.1632 0 163.2768-73.1136 163.2768-163.2768V337.4592c0-75.52-51.3024-139.0592-120.9856-157.696z m-204.4928 517.376h-286.72c-18.176 0-32.9216-14.7456-32.9216-32.9216s14.7456-32.9216 32.9216-32.9216h286.72c18.176 0 32.9216 14.7456 32.9216 32.9216s-14.7456 32.9216-32.9216 32.9216z m140.5952-166.7072H308.8384c-18.176 0-32.9216-14.7456-32.9216-32.9216s14.7456-32.9216 32.9216-32.9216h427.3152c18.176 0 32.9216 14.7456 32.9216 32.9216s-14.7456 32.9216-32.9216 32.9216z" fill="${color}" p-id="6632" data-spm-anchor-id="a313x.manage_type_myprojects.0.i0.46df3a81DkdazW" class=""></path></svg>
-`.trim();
-	return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`;
-};
\ No newline at end of file
diff --git a/src/components/examination/es-analysis.vue b/src/components/examination/es-analysis.vue
index 6174f9f2..84e5bea3 100644
--- a/src/components/examination/es-analysis.vue
+++ b/src/components/examination/es-analysis.vue
@@ -3,20 +3,25 @@
 		<view class="line">
 			<text class="tr">维度评分：</text>
 			<text class="td">{{ dimension_all_score }}</text>
+			
+			<view class="td_success_error_img">
+				<image :src="select_status_icon" class="img"></image>
+			</view>
 		</view>
 		<view class="line" v-for="item in evalSettingVos">
 			<text class="tr">{{ item.gradeDimens }}：</text>
 			<text class="td">{{ item.anlyGrade }}</text>
-			<view class="your_answer" v-if="item.dimensCode==='01'">
+			<view class="your_answer" v-if="item.dimensCode === '01'">
 				<rich-text :nodes="highlightedText" class="content" />
 			</view>
 		</view>
-		
 	</view>
 </template>
 
 <script setup>
 	import { ref, reactive, onMounted, nextTick, computed, toRaw, watch } from 'vue';
+	import { optionErrorIcon, optionSuccessIcon } from '@/common/imgSvg';
+
 	const emit = defineEmits(['click_option']);
 	const props = defineProps({
 		value: {
@@ -37,27 +42,30 @@
 	});
 	const evalSettingVos = computed(() => props.value.evalSettingVos);
 	const status = computed(() => (props.judgeResult ? 'success' : 'error'));
-	const keywords = computed(() => {
-	  if (!props.value.relKeyword) return [];
-	  return props.value.relKeyword.split(',').map(key => key.trim());
+	const select_status_icon = computed(() => {
+		if (props.judgeResult) {
+			return optionSuccessIcon('#15B859');
+		} else {
+			return optionErrorIcon();
+		}
 	});
-	
+	const keywords = computed(() => {
+		if (!props.value.relKeyword) return [];
+		return props.value.relKeyword.split(',').map((key) => key.trim());
+	});
+
 	const highlightedText = computed(() => {
-	  // 如果没有关键词，直接返回原文本
-	  if (!keywords.value.length) return props.answerText;
-	  // 构建正则表达式，匹配所有关键词（不区分大小写）
-	  // 对关键词进行转义，避免特殊字符影响正则
-	  const escapedKeywords = keywords.value.map(keyword => 
-	    keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-	  );
-	  
-	  // 创建正则表达式，g表示全局匹配，i表示不区分大小写
-	  const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi');
-	  
-	  // 替换匹配到的关键词，用span包裹并添加高亮样式
-	  return  props.answerText.replace(regex, (match) => 
-	    `<span class="highlight">${match}</span>`
-	  );
+		// 如果没有关键词，直接返回原文本
+		if (!keywords.value.length) return '你的答案：' + props.answerText;
+		// 构建正则表达式，匹配所有关键词（不区分大小写）
+		// 对关键词进行转义，避免特殊字符影响正则
+		const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+
+		// 创建正则表达式，g表示全局匹配，i表示不区分大小写
+		const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi');
+
+		// 替换匹配到的关键词，用span包裹并添加高亮样式
+		return '你的答案：' + props.answerText.replace(regex, (match) => `<span class="highlight">${match}</span>`);
 	});
 	const dimension_all_score = computed(() => {
 		return (
@@ -77,7 +85,6 @@
 </script>
 
 <style scoped lang="scss">
-	
 	.success {
 		background-color: #e7f8ed;
 		.td {
@@ -96,12 +103,12 @@
 			color: #f5212d;
 		}
 	}
-	.your_answer{
+	.your_answer {
 		:deep(.highlight) {
 			text-decoration: underline;
 		}
 	}
-	
+
 	.analysis_div {
 		margin-top: 30rpx;
 
@@ -109,6 +116,7 @@
 		padding: 22rpx 15rpx 15rpx 34rpx;
 		.line {
 			margin: 12rpx 0;
+			position: relative;
 		}
 		.tr {
 			font-weight: 600;
@@ -119,13 +127,23 @@
 			font-weight: 600;
 			font-size: 30rpx;
 		}
-		.your_answer{
+		.your_answer {
 			font-weight: 500;
 			font-size: 30rpx;
 			color: #333333;
-			line-height: 40rpx;
+			line-height: 46rpx;
 			text-align: left;
 			margin-top: 12rpx;
 		}
+		.td_success_error_img {
+			position: absolute;
+			right: 0;
+			top: 0;
+			.img {
+				width: 30rpx;
+				height: 30rpx;
+				padding-right: 20rpx;
+			}
+		}
 	}
 </style>
diff --git a/src/components/examination/question.vue b/src/components/examination/question.vue
index e2562594..74b0ae3c 100644
--- a/src/components/examination/question.vue
+++ b/src/components/examination/question.vue
@@ -32,10 +32,18 @@
 				</view>
 				<view class="text-btn" v-if="!textShow" @click.stop="translateVoice()">文</view>
 				<view class="fl1"></view>
-				<view v-show="!props.isPreview && props.button_again_show" class="btns-cont-button-text" @click.stop="buutton_click('again')">
+				<view
+					v-show="!props.isPreview && props.button_again_show"
+					class="btns-cont-button-text"
+					@click.stop="buutton_click('again')"
+				>
 					重答
 				</view>
-				<view v-show="!props.isPreview && props.button_complete_show" class="btns-cont-button-text" @click.stop="buutton_click('complete')">
+				<view
+					v-show="!props.isPreview && props.button_complete_show"
+					class="btns-cont-button-text"
+					@click.stop="buutton_click('complete')"
+				>
 					完成
 				</view>
 			</view>
@@ -49,8 +57,16 @@
 			</view>
 			<view class="btns-cont" v-show="!props.isPreview">
 				<view class="fl1"></view>
-				<view v-if="props.button_again_show" class="btns-cont-button-text" @click.stop="buutton_click('again')">重答</view>
-				<view v-if="props.button_complete_show" class="btns-cont-button-text" @click.stop="buutton_click('complete')">完成</view>
+				<view v-if="props.button_again_show" class="btns-cont-button-text" @click.stop="buutton_click('again')">
+					重答
+				</view>
+				<view
+					v-if="props.button_complete_show"
+					class="btns-cont-button-text"
+					@click.stop="buutton_click('complete')"
+				>
+					完成
+				</view>
 			</view>
 		</view>
 		<view class="talking-info talking-info-loading" v-else-if="status === '00'">
@@ -62,7 +78,7 @@
 </template>
 
 <script setup>
-	import { computed, unref, ref, toRefs, watch, onMounted } from 'vue';
+	import { computed, unref, ref, toRefs, watch, onMounted, nextTick } from 'vue';
 	import { onUnload } from '@dcloudio/uni-app';
 	import { useAudioStore } from '@/store/audioStore';
 	const props = defineProps({
@@ -105,9 +121,8 @@
 			// 是否显示重答按钮
 			default: true,
 			type: Boolean
-		},
+		}
 	});
-	console.log('props.isPreview', props.isPreview);
 	const audioStore = useAudioStore();
 	const { dataInfo } = toRefs(props);
 	const status = computed(() => props.status);
@@ -126,6 +141,11 @@
 
 	// 按钮点击
 	const buutton_click = (type) => {
+		if (type === 'again') {
+			nextTick(() => {
+				textShow.value = true;
+			});
+		}
 		emit('buutton_click', type, props.dataInfo);
 	};
 
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 454cad8d..eb2c27cf 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -16,16 +16,28 @@
 					<image :src="feedbackIcon()" class="img" @click="feedback_click()"></image>
 				</view>
 				<template v-if="['mistake'].includes(props.mode)">
-					<view class="right_text" @click="toggleExpand()">展开</view>
-					<uv-icon class="arrow-icon" name="arrow-right" color="#0066FF"></uv-icon>
+					<view class="expand_button_div" @click="toggleExpand()">
+						<!-- <view class="right_text">{{animationState?'收起':'展开'}}</view> -->
+
+						<view class="toggle-container">
+							<view class="toggle-text" :class="{ active: !animationState }">展开</view>
+							<view class="toggle-text" :class="{ active: animationState }">收起</view>
+						</view>
+
+						<uv-icon
+							class="click_text_icon"
+							name="arrow-right"
+							:class="{ click_text_icon_action: animationState }"
+							color="#0066FF"
+						></uv-icon>
+					</view>
 				</template>
 			</view>
 		</view>
 		<view class="question_text">
 			{{ subject_data.qnsContent }}
 		</view>
-
-		<view :style="props.mode === 'mistake' ? animationStyle : {}" class="collapse-wrapper" ref="wrapperRef">
+		<view :style="{ height: animationHeight }" :class="{ collapse_wrapper: props.mode === 'mistake' }" ref="wrapperRef">
 			<view class="collapse-content" ref="contentRef">
 				<view class="option_div">
 					<template v-if="qnsTyp === 'ES'">
@@ -95,7 +107,7 @@
 	</view>
 </template>
 <script setup>
-	import { ref, reactive, onMounted, nextTick, computed, getCurrentInstance } from 'vue';
+	import { ref, reactive, onMounted, nextTick, computed, getCurrentInstance, watch  } from 'vue';
 	import radioSubjectItem from './radio-subject-item.vue';
 	import esAnalysis from './es-analysis.vue';
 	import questionVue from './question.vue';
@@ -149,11 +161,10 @@
 	const wrapperRef = ref(null);
 	const contentRef = ref(null);
 	const judgeResultStatus = computed(() => props.item.judgeResult === 'P');
-	const animationStyle = ref({
-		height: '0px',
-		overflow: 'hidden',
-		transition: 'height 0.3s ease-in-out'
-	});
+
+	// 不是错题本就默认不折叠，错题本默认折叠
+	const animationState = ref(props.mode !== 'mistake' ? true : false);
+	const animationHeight = ref(props.mode !== 'mistake' ? '' : '0px');
 
 	const modelValue = computed({
 		get: () => props.modelValue,
@@ -172,14 +183,21 @@
 
 	// 切换展开/折叠状态（兼容H5和App）
 	const toggleExpand = async () => {
-		console.log('切换展开/折叠状态');
-		const query = uni.createSelectorQuery().in(instance);
-		query
-			.select('.collapse-content')
-			.boundingClientRect((rect) => {
-				console.log('rect', rect);
-			})
-			.exec();
+		console.log('切换展开/折叠状态', animationHeight.value, animationState.value);
+		if (!animationState.value) {
+			animationState.value = true;
+			const query = uni.createSelectorQuery().in(instance);
+			query
+				.select('.collapse-content')
+				.boundingClientRect((rect) => {
+					animationHeight.value = `${rect.height}px`;
+					console.log('rect', rect);
+				})
+				.exec();
+		} else {
+			animationState.value = false;
+			animationHeight.value = '0px';
+		}
 	};
 	const queryRect = () => {
 		// 组件内部一般用this.$uvGetRect，对外的为getRect，二者功能一致，名称不同
@@ -204,6 +222,7 @@
 		const anserResultArray = props.item.anserResult.split(',');
 		return subject_data.value.itemVos.filter((res) => anserResultArray.includes(res.itemId)).map((res) => res.itemNo);
 	});
+	
 	// 判断选项是否完全正确
 	const right_or_wrong_class = computed(
 		() =>
@@ -285,16 +304,54 @@
 			answerItems: subject_data.value.itemVos.filter((t) => item_answer.value.includes(t.itemId))
 		});
 	};
-
 	// 初始化动画
 	onMounted(() => {});
 </script>
 
 <style scoped lang="scss">
-	.collapse-wrapper {
-		// overflow: hidden; /* 关键：隐藏超出部分 */
+	.expand_button_div {
+		/* 相对定位，让两个文本重叠 */
+		// display: inline-block;
+		// cursor: pointer;
+	}
+	.toggle-container {
+		position: relative;
+		height: 42rpx;
+		width: 60rpx;
+		font-size: 30rpx;
+		line-height: 42rpx;
+	}
+	.toggle-text {
+		/* 绝对定位使文本重叠 */
+		position: absolute;
+		top: 0;
+		left: 0;
+		/* 初始状态：非激活文本透明且轻微下移 */
+		opacity: 0;
+		// transform: translateY(15rpx);
+		/* 添加过渡动画 */
+		transition: all 0.2s ease-out;
+		/* 确保文本占据空间一致 */
+		white-space: nowrap;
+	}
+
+	/* 激活状态：文本可见且位置正常 */
+	.toggle-text.active {
+		opacity: 1;
+		transform: translateY(0);
+		z-index: 1; /* 确保激活文本在上方 */
+	}
+
+	.collapse_wrapper {
+		overflow: hidden; /* 关键：隐藏超出部分 */
 		// height: 0; /* 初始高度为0 */
-		// transition: height 0.3s ease-in-out;
+		transition: height 0.3s ease-out;
+	}
+	.click_text_icon_action {
+		transform: rotate(-90deg);
+	}
+	.click_text_icon {
+		transition: transform 0.3s ease-out;
 	}
 
 	.mark_and_feedback_div {
@@ -310,6 +367,13 @@
 			padding: 4rpx;
 		}
 	}
+	.expand_button_div {
+		display: flex;
+		align-items: center;
+		width: 90rpx;
+
+		justify-content: space-between;
+	}
 	.option_div {
 		padding-top: 20rpx;
 	}
diff --git a/src/pages.json b/src/pages.json
index 35f982b2..201d7d54 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -190,6 +190,15 @@
                 }
             }
         },
+        {
+            "path": "pages/wrongQuestionRecord/correct",
+            "style": {
+                "navigationBarTitleText": "错题本做题页",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
         {
             "path": "pages/examination/index",
             "style": {
@@ -280,6 +289,24 @@
                 }
             }
         },
+        {
+            "path": "pages/wrongQuestionRecord/result",
+            "style": {
+                "navigationBarTitleText": "答题本答题完成结果页",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
+        {
+            "path": "pages/practice/result",
+            "style": {
+                "navigationBarTitleText": "练习完成结果页",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
         {
             "path": "pages/course/index",
             "style": {
diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue
index b3314e69..fe673655 100644
--- a/src/pages/courseDetail/components/comment.vue
+++ b/src/pages/courseDetail/components/comment.vue
@@ -116,6 +116,7 @@
 	import { ref, reactive, onMounted, nextTick } from 'vue';
 	import { queryTraCrsBbsInfoByCrsId, replyTraCrsBbsInfo, qryChildTraCrsBbsInfo } from '@/api/courseDetail.js';
 	import common from '@/common/common.js';
+	import {setupKeyboardHeightListener} from '@/common/common.js';
 	import { get_base_url } from '@/api/request.js';
 
 	const popup = ref(null);
@@ -144,23 +145,14 @@
 		imgId: String
 	});
 	const click_reply = (item, parentBbsId, index) => {
+		
 		popup.value.open('bottom');
 		reply_data.placeholder = '回复 ' + item.userName + '：';
 		reply_data.parentBbsId = parentBbsId;
 		reply_data.bbsId = item.bbsId;
 		reply_data.index = index;
-		const systemInfo = uni.getSystemInfoSync();
-		// 安全区域底部到屏幕底部的高度（即底部安全区域高度）
-		const safeAreaBottomHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom;
-		nextTick(() => {
-			uni.onKeyboardHeightChange((res) => {
-				let keyboardHeight = res.height;
-				// 仅在iOS端补偿安全区域高度
-				if (systemInfo.platform === 'ios') {
-					keyboardHeight = Math.max(0, keyboardHeight - safeAreaBottomHeight); // 避免负数
-				}
-				popup_input_bottom.value = `${keyboardHeight}px`;
-			});
+		setupKeyboardHeightListener((height) => {
+			popup_input_bottom.value = `${height}px`;
 		});
 	};
 	const reply_send = async () => {
diff --git a/src/pages/courseDetail/components/introduce.vue b/src/pages/courseDetail/components/introduce.vue
index d3f8c4c4..a2cbd135 100644
--- a/src/pages/courseDetail/components/introduce.vue
+++ b/src/pages/courseDetail/components/introduce.vue
@@ -12,14 +12,16 @@
 		</view>
 		<view class="info-middle font_pf">
 			<view class="fz-30 fw-400 mb-8">更新日期</view>
-			<view class="fz-30 fw-400">{{ (modelValue.mtTime || '').substr(0,16) }}</view>
+			<view class="fz-30 fw-400">{{ (modelValue.mtTime || '').substr(0, 16) }}</view>
 		</view>
 		<view class="info-bottom">
 			<view class="bottom-left">
 				<view class="mb-64">
 					<view class="fz-30 font_pf fw-400 mb-18">标签</view>
 					<view class="label" v-if="modelValue.tagCataList">
-						<text class="label-item font_pf" v-for="item in modelValue.tagCataList" :key="item.tagId">{{ item.tagName }}</text>
+						<text class="label-item font_pf" v-for="item in modelValue.tagCataList" :key="item.tagId">
+							{{ item.tagName }}
+						</text>
 					</view>
 				</view>
 				<view class="mb-64">
@@ -31,22 +33,35 @@
 					<view class="fz-30 font_pf fw-400">{{ modelValue.belgOrgName }}</view>
 				</view>
 			</view>
+
 			<view class="bottom-right">
 				<image src="/src/static/images/courseDetail/ditu.png" class="right-img" mode="widthFix"></image>
 			</view>
 		</view>
+		<view class="mb-64">
+			<view class="fz-30 font_pf fw-400 mb-4">课程核心</view>
+			<view class="examination_core">
+				{{ modelValue.crsCore }}
+			</view>
+		</view>
 	</view>
 </template>
 
 <script setup>
 	import common from '@/common/common';
 	const props = defineProps({
-		modelValue:Object
-	})
-	
+		modelValue: Object
+	});
 </script>
 
 <style lang="scss" scoped>
+	.examination_core{
+		padding: 0 15rpx 0 0;
+		line-height: 50rpx;
+		font-size: 30rpx;
+		color: #333;
+		padding-bottom: 20rpx;
+	}
 	.course-info {
 		box-sizing: border-box;
 		// width: 100%;
@@ -115,4 +130,4 @@
 			object-fit: cover;
 		}
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index c1dcf43c..ecef8d83 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -40,7 +40,7 @@
 						</view>
 						<view
 							class="num-item examination"
-							@click="common.navigateTo('/pages/examRanking/index?crsId=' + crsId)"
+							@click="common.navigateTo(`/pages/examRanking/index?crsId=${crsId}`)"
 						>
 							<image
 								class="title-icon"
@@ -51,24 +51,17 @@
 							<view class="back-icon"></view>
 						</view>
 						<view class="fl1"></view>
-						<view class="num-item" @click="collect_click(form.collectId)">
-							<image
-								v-if="form.collectId"
-								class="collect-icon"
-								src="/src/static/images/courseDetail/out_collect.png"
-								mode="widthFix"
-							></image>
-							<image
-								v-else
-								class="collect-icon"
-								src="/src/static/images/courseDetail/in_collect.png"
-								mode="widthFix"
-							></image>
-						</view>
+						 <view class="num-item" @click="collect_click(form.collectId)">
+						    <image
+						      class="collect-icon"
+						      :src="form.collectId ? collectedImg : notCollectedImg"
+						      mode="widthFix"
+						    ></image>
+						  </view>
 					</view>
 				</view>
 				<view class="body-box">
-					<uv-sticky :customNavHeight="statusBarHeight" id="tabsDiv" class="sticky">
+					<uv-sticky :customNavHeight="statusBarHeight" class="sticky">
 						<view class="body-tab">
 							<uv-tabs
 								class="font_pf"
@@ -99,24 +92,21 @@
 			</view>
 		</scroll-view>
 		<view class="btn-box btn-box-height font_pf">
-			<template v-if="[0, 1].includes(tabAct)">
+			<template v-if="[0, 1].includes(tabAct)" >
 				<uv-button
 					type="primary"
-					@click="
-						common.navigateTo(
-							'/pages/course/study?crsNum=' + form.crsNum + '&crsId=' + crsId + '&imgId=' + form.imgId
-						)
-					"
+					@click="common.navigateTo(`/pages/course/study?crsId=${crsId}&isPreview=${isPreview}&imgId=${form.imgId}`)"
 				>
 					去学习
 				</uv-button>
-				<uv-button type="primary" @click="goto_practice()">去练习</uv-button>
-				<uv-button type="primary" @click="goto_examination()">去考试</uv-button>
+				<uv-button type="primary" :disabled="isPreview === 'preview'" @click="goto_practice()">去练习</uv-button>
+				<uv-button type="primary" :disabled="isPreview === 'preview'" @click="goto_examination()">去考试</uv-button>
 			</template>
-			<template v-if="tabAct == 2">
+			<template v-if="tabAct === 2">
 				<uv-button
 					type="primary"
 					class="send_evaluate"
+					:disabled="isPreview === 'preview'"
 					@click="common.navigateTo('/pages/courseDetail/submit?crsId=' + crsId + '&imgId=' + form.imgId)"
 				>
 					发布评价
@@ -138,16 +128,17 @@
 	import introduceVue from './components/introduce.vue';
 	import knowledge from './components/knowledge.vue';
 	import comment from './components/comment.vue';
+	import collectedImg from '@/static/images/courseDetail/out_collect.png';
+	import notCollectedImg from '@/static/images/courseDetail/in_collect.png';
 	const statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 	// tab栏
 	const tabList = ref([{ name: '课程介绍' }, { name: '知识点' }, { name: '评价' }]);
 
-	const test = ref(false);
 	const commentRef = ref(null);
-	const tabsDiv = ref(null);
 	const form = ref({});
 	const crsId = ref('');
 	const collectId = ref(''); // 记录初始的收藏id
+	const isPreview = ref(''); // 记录是否是预览
 	const tabAct = ref(0);
 	const scrollTop = ref(0);
 	const tabSwitch = (item) => {
@@ -159,7 +150,7 @@
 			commentRef.value?.getData();
 		}
 	};
-
+	
 	const getData = async () => {
 		const { body } = await getCourseDetailApi({
 			crsId: crsId.value
@@ -184,8 +175,8 @@
 		const opacity = Math.min(1, (scrollTop.value - 20) / 80);
 		return `rgba(255,255,255,${opacity})`;
 	});
-	// 子组件滑动开启状态
-	const childScrollStatus = ref(false);
+	
+	
 	const scroll_fun = (e) => {
 		scrollTop.value = e.detail.scrollTop;
 	};
@@ -193,8 +184,10 @@
 	const swiper_change = (res) => {
 		tabAct.value = res.detail.current;
 	};
+	
 	// 去考试
 	const goto_examination = async () => {
+		if(isPreview.value === 'preview') return common.msg('预览课程不允许考试');
 		common.loading();
 		startExamByCrs({
 			crsId: crsId.value
@@ -213,6 +206,7 @@
 	};
 	// 去练习
 	const goto_practice = async () => {
+		if(isPreview.value === 'preview') return common.msg('预览课程不允许练习');
 		common.loading();
 		startPracticeByCrs({
 			crsId: crsId.value
@@ -230,7 +224,6 @@
 				common.hideLoading();
 			});
 	};
-	// uni.$emit('refresh_comment_data');
 	const collect_click = async (id) => {
 		try {
 			if (!id) {
@@ -258,7 +251,6 @@
 	};
 	onMounted(async () => {
 		uni.$on('refresh_comment_data', () => {
-			// console.log('发评论了刷新');
 			commentRef.value?.getData('submit');
 			tabAct.value = 2;
 		});
@@ -266,6 +258,7 @@
 	onLoad((params) => {
 		crsId.value = params.crsId;
 		collectId.value = params.collectId || '';
+		isPreview.value = params.isPreview || '';
 	});
 	onShow(() => {
 		getData();
diff --git a/src/pages/courseRecord/coursePracticeRecordDetail.vue b/src/pages/courseRecord/coursePracticeRecordDetail.vue
index 9b5ee32f..9a5c3f22 100644
--- a/src/pages/courseRecord/coursePracticeRecordDetail.vue
+++ b/src/pages/courseRecord/coursePracticeRecordDetail.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="main_div max_page">
+		<nav-bar></nav-bar>
 		<view class="nav-div">
 			<view class="title ellipsis-text">练习记录</view>
 			<view class="back_div" @click="common.navigateBack()">
@@ -116,6 +117,7 @@
 	}
 
 	.main_div {
+		
 		display: flex;
 		flex-direction: column;
 		background-color: #f0f5f9;
diff --git a/src/pages/examination/components/dialog.vue b/src/pages/examination/components/dialog.vue
index 71e23d7e..79e9c611 100644
--- a/src/pages/examination/components/dialog.vue
+++ b/src/pages/examination/components/dialog.vue
@@ -30,7 +30,7 @@
 	const props = defineProps({
 		dialogConfiguration: {
 			type: Object,
-			required: true,
+			required: false,
 		}
 	});
 	const emit = defineEmits(['button_click'])
@@ -45,13 +45,13 @@
 	}
 
 	const close = () => PopupRef.value?.close()
-	const open = () => {
+	const open = (dialogConfiguration) => {
 		// 解构赋值更清晰
 		const {
 			title: t,
 			html: h,
 			buttonList: bl = []
-		} = props.dialogConfiguration || {};
+		} = dialogConfiguration || props.dialogConfiguration || {};
 		title.value = t || '';
 		html.value = h || '';
 		buttonList.value = Array.isArray(bl) ? bl : [];
diff --git a/src/pages/examination/components/feedback.vue b/src/pages/examination/components/feedback.vue
index 290fed4b..af602101 100644
--- a/src/pages/examination/components/feedback.vue
+++ b/src/pages/examination/components/feedback.vue
@@ -92,7 +92,7 @@
 		const startTime = Date.now();
 		saveTraQnsFeedback({
 			qnsId: feedbackInfo.qnsId,
-			fbComtent: feedbackInfo.text.trim(),
+			fbContent: feedbackInfo.text.trim(),
 			fbTyp: feedbackInfo.type.join(',')
 		})
 			.then(async (res) => {
diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue
index c4c29919..e21cfd16 100644
--- a/src/pages/examination/index.vue
+++ b/src/pages/examination/index.vue
@@ -160,7 +160,7 @@
 	const touchBtnRef = ref(null);
 	let examinationStartTime = 0; // 考试开始时间
 
-	const mode = ref('examination'); // 考试 examination 练习practice
+	const mode = 'examination'; // 考试 examination 练习practice
 	const paperData = reactive({
 		crsId: '', // 课程ID,通过课程id是否为空字符串判断这个试卷是课程考试还是考试中心考试
 		execId: '', // 执行ID
@@ -406,6 +406,7 @@
 	// 执行交卷
 	const hand_in_paper = () => {
 		const answerDtoList = topicList.map((res) => {
+			console.log('resres', res);
 			let answerItem = {
 				examId: paperData.examId,
 				papersId: paperData.papersId,
@@ -417,7 +418,9 @@
 				// 问答题特殊处理
 				return {
 					...answerItem,
-					anserResult: ''
+					anserResult: res.my_answer.anserResult,
+					ossKey: res.my_answer.ossKey || '',
+					ossAddr: res.my_answer.ossAddr || ''
 				};
 			} else {
 				//其他题
@@ -427,7 +430,7 @@
 				};
 			}
 		});
-
+		console.log('提交的', answerDtoList);
 		console.log('answerDtoList', answerDtoList);
 		dialogRef.value.close();
 		common.loading('正在提交');
@@ -457,7 +460,7 @@
 				// 需要查分
 				const examLenTm = 678;
 				common.redirectTo(
-					`/pages/examination/result?execId=${res.body.execId}&examLenTm=${examLenTm}&papersName=${paperData.papersName}&papersId=${paperData.papersId}&mode=${mode.value}&crsId=${paperData.crsId}`
+					`/pages/examination/result?execId=${res.body.execId}&examLenTm=${examLenTm}&papersName=${paperData.papersName}&papersId=${paperData.papersId}&mode=${mode}&crsId=${paperData.crsId}`
 				);
 			} else {
 				// todo 此处应该有个弹窗交代下结果
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index f0a4ee26..07c56692 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -53,7 +53,7 @@
 		<view class="scroll-div">
 			<view class="paper_title_div">
 				<image src="@/static/images/testingHall/testing.png" class="img" mode="aspectFit"></image>
-				<view class="title">试卷信息</view>
+				<view class="title">任务历程</view>
 			</view>
 			<scroll-view
 				ref="scrollRef"
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index f176f2c1..ef5cba2f 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -38,7 +38,7 @@
 						<view class="fl1"></view>
 					</view>
 					<!-- 显示当前选中的徽章 -->
-					<view class="dan" @click="changeBadge">
+					<!-- <view class="dan" @click="changeBadge">
 						<view class="dan_img">
 							<image
 								class="img_100"
@@ -48,7 +48,7 @@
 							></image>
 						</view>
 						<view class="dan_text">{{ badgeList[currentIndex].name }}</view>
-					</view>
+					</view> -->
 				</view>
 				<!-- 用户学习时间信息 -->
 				<view class="study_information">
@@ -56,8 +56,8 @@
 						<view class="top">我的积分</view>
 						<view class="bottom">
 							<uv-count-to
-								:startVal="statistics_data['startAccmTaskCnt']"
-								:endVal="statistics_data['accmTaskCnt']"
+								:startVal="0"
+								:endVal="0"
 								:useEasing="true"
 								ref="accmTaskCntRef"
 							></uv-count-to>
@@ -68,8 +68,8 @@
 						<view class="top">徽章墙</view>
 						<view class="bottom">
 							<uv-count-to
-								:startVal="statistics_data['startAccmTaskCnt']"
-								:endVal="statistics_data['accmTaskCnt']"
+								:startVal="0"
+								:endVal="0"
 								:useEasing="true"
 								ref="accmTaskCntRef"
 							></uv-count-to>
@@ -80,41 +80,34 @@
 		</view>
 		<!-- 4个导航 -->
 		<view class="navigation_div">
-			<uv-scroll-list class="scroll-view">
-				<!-- <scroll-view  scroll-x="true" :show-scrollbar="false"> -->
-				<view class="scroll-view-item">
-					<view class="item" @click="common.navigateTo('/pages/courseRecord/index')">
-						<image class="icon" src="@/static/images/me/study.png"></image>
-						<view class="title">课程记录</view>
-					</view>
+			<!-- <uv-scroll-list class="scroll-view"> -->
+			<!-- <scroll-view  scroll-x="true" :show-scrollbar="false"> -->
+			<view class="scroll-view-item">
+				<view class="item" @click="common.navigateTo('/pages/courseRecord/index')">
+					<image class="icon" src="@/static/images/me/study.png"></image>
+					<view class="title">课程记录</view>
 				</view>
+			</view>
 
-				<view class="scroll-view-item" @click="common.navigateTo('/pages/examinationRecord/index')">
-					<view class="item">
-						<image class="icon" src="@/static/images/me/examination.png"></image>
-						<view class="title">考试记录</view>
-					</view>
+			<view class="scroll-view-item" @click="common.navigateTo('/pages/examinationRecord/index')">
+				<view class="item">
+					<image class="icon" src="@/static/images/me/report.png"></image>
+					<view class="title">考试记录</view>
 				</view>
-				<view class="scroll-view-item">
-					<view class="item">
-						<image class="icon" src="@/static/images/me/report.png"></image>
-						<view class="title">竞赛记录</view>
-					</view>
+			</view>
+			<view class="scroll-view-item">
+				<view class="item">
+					<image class="icon" src="@/static/images/me/todo.png"></image>
+					<view class="title">AI陪练记录</view>
 				</view>
-				<view class="scroll-view-item">
-					<view class="item">
-						<image class="icon" src="@/static/images/me/todo.png"></image>
-						<view class="title">AI陪练记录</view>
-					</view>
+			</view>
+			<view class="scroll-view-item">
+				<view class="item">
+					<image class="icon" src="@/static/images/me/examination.png"></image>
+					<view class="title">竞赛记录</view>
 				</view>
-				<view class="scroll-view-item">
-					<view class="item">
-						<image class="icon" src="@/static/images/me/report.png"></image>
-						<view class="title">AI问答记录</view>
-					</view>
-				</view>
-				<!-- </scroll-view> -->
-			</uv-scroll-list>
+			</view>
+			<!-- </uv-scroll-list> -->
 		</view>
 		<view class="cell_div">
 			<uv-cell-group :border="false">
@@ -212,72 +205,7 @@
 	const accmTaskCntRef = ref(null);
 	const accmPointRef = ref(null);
 	const stdtTmLenRef = ref(null);
-	const statistics_data = reactive({
-		stdtTmLen: 0, // 累计学习时长
-		accmTaskCnt: 0, // 累计完成任务
-		accmPoint: 0, // 累计获得积分
-		startStdtTmLen: 0, // 起始累计学习时长
-		startAccmTaskCnt: 0, // 起始累计完成任务
-		startAccmPoint: 0, // 起始累计获得积分
-		request_time: 0, // 上次请求时间
-		init: function () {
-			// 初始化统计数据
-			console.log('初始化统计数据');
-			const me_statistics_data = common.getValue('statistics_data'); // 获取缓存
-			if (me_statistics_data) {
-				this.stdtTmLen = me_statistics_data.stdtTmLen;
-				this.accmTaskCnt = me_statistics_data.accmTaskCnt;
-				this.accmPoint = me_statistics_data.accmPoint;
-			}
-		},
-		get_statistics_data: async function () {
-			try {
-				const time_now = Date.now();
-				let statistics_data = common.getValue('statistics_data') || {};
-				if (time_now - this.request_time > 300) {
-					this.request_time = time_now;
-					// 获取最新数据
-					const res = await queryTraStdyStatisticsSelf();
-					if (res && res.body) {
-						// 合并新数据与缓存数据，确保只更新有效字段
-						statistics_data = {
-							...statistics_data,
-							stdtTmLen: res.body.stdtTmLen || 0,
-							accmTaskCnt: res.body.accmTaskCnt || 0,
-							accmPoint: res.body.accmPoint || 0
-						};
 
-						common.setValue('statistics_data', statistics_data);
-					}
-				}
-
-				// 解构赋值获取最新值
-				const { accmPoint = 0, accmTaskCnt = 0, stdtTmLen = 0 } = statistics_data;
-
-				// 更新数据并触发动画
-				if (accmPoint !== this.accmPoint) {
-					this.startAccmPoint = this.accmPoint;
-					this.accmPoint = accmPoint;
-					accmPointRef.value?.start();
-				}
-
-				if (accmTaskCnt !== this.accmTaskCnt) {
-					this.startAccmTaskCnt = this.accmTaskCnt;
-					this.accmTaskCnt = accmTaskCnt;
-					accmTaskCntRef.value?.start();
-				}
-
-				if (stdtTmLen !== this.stdtTmLen) {
-					this.startStdtTmLen = this.stdtTmLen;
-					this.stdtTmLen = stdtTmLen;
-					stdtTmLenRef.value?.start();
-				}
-			} catch (error) {
-				console.error('获取统计数据失败:', error);
-				// 可以在这里添加更多的错误处理逻辑，比如显示错误提示
-			}
-		}
-	});
 	const user_info = reactive({
 		userName: '',
 		userId: '',
@@ -302,16 +230,12 @@
 			common.reLaunch('/pages/login/login');
 		});
 	};
-	onLoad(() => {
-		statistics_data['init'](); // 初始化数据
-	});
+	onLoad(() => {});
 	onShow(() => {
 		setMascot();
 		Object.assign(user_info, getUserInfo());
-		statistics_data['get_statistics_data'](); // 获取统计数据
 	});
 	onPullDownRefresh(() => {
-		console.log('下拉刷新');
 		uni.stopPullDownRefresh();
 	});
 
@@ -389,11 +313,12 @@
 	// 快捷导航栏
 	.navigation_div {
 		margin: 30rpx $bg-margin-left 0 $bg-margin-left;
-		padding: 24rpx 0 0 20rpx;
+		// padding: 24rpx 0 0 20rpx;
+		padding: 24rpx 10rpx;
 		background-color: #ffffff;
 		border-radius: 23rpx;
 		display: flex;
-		flex-direction: column;
+		// flex-direction: column;
 		justify-content: space-around;
 		z-index: 101;
 
@@ -541,15 +466,15 @@
 						top: 20%;
 						transform: translateX(-50%);
 						width: 1rpx;
-						height: 60%;
-						width: 4rpx;
-						height: 54rpx;
-						background: linear-gradient(
-							to bottom,
-							rgba(239, 246, 255, 0) 0%,
-							rgba(229, 239, 255, 1) 30%,
-							rgba(229, 239, 255, 1) 70%,
-							rgba(239, 246, 255, 0) 100%
+						height: 60%;
+						width: 4rpx;
+						height: 54rpx;
+						background: linear-gradient(
+							to bottom,
+							rgba(239, 246, 255, 0) 0%,
+							rgba(229, 239, 255, 1) 30%,
+							rgba(229, 239, 255, 1) 70%,
+							rgba(239, 246, 255, 0) 100%
 						);
 					}
 				}
diff --git a/src/pages/messageNotification/index.vue b/src/pages/messageNotification/index.vue
index 68d17a31..8bae4cd6 100644
--- a/src/pages/messageNotification/index.vue
+++ b/src/pages/messageNotification/index.vue
@@ -9,18 +9,6 @@
 				<image class="img" src="@/static/images/messageNotification/delete_icon.png" mode="aspectFit"></image>
 			</view>
 		</view>
-		<!-- <view class="input-view">
-			<uv-input
-				shape="circle"
-				placeholderStyle="color:#999999;font-size:28rpx"
-				placeholder="请输入关键词"
-				suffixIcon="search"
-				:customStyle="customStyle"
-				:suffixIconStyle="suffixIconStyle"
-			>
-			
-			</uv-input>
-		</view> -->
 		<scroll-view
 			ref="scrollRef"
 			:scroll-y="true"
@@ -36,23 +24,17 @@
 			<view class="item" v-for="(item, index) in data_list" @click="readMessageOpen(item)">
 				<view class="icon">
 					<image
-						v-if="item.noticeTyp == '01'"
 						class="img_100"
-						src="@/static/images/messageNotification/type_01.png"
+						:src="imageMap[item.noticeTyp]"
 						mode="widthFix"
 					></image>
-					<image
+					<!-- <image
 						v-if="item.noticeTyp == '02'"
 						class="img_100"
 						src="@/static/images/messageNotification/type_02.png"
 						mode="widthFix"
-					></image>
-					<image
-						v-if="item.noticeTyp == '03'"
-						class="img_100"
-						src="@/static/images/messageNotification/type_03.png"
-						mode="widthFix"
-					></image>
+					></image> -->
+					
 				</view>
 				<view class="right">
 					<view class="top">
@@ -96,22 +78,21 @@
 	import { onLoad } from '@dcloudio/uni-app';
 	import { queryTraPersonalMessageNoticePaging, readNotice, oneTimeRead } from '@/api/messageNotification.js';
 	import common from '../../common/common';
-
-	const customStyle = {
-		backgroundColor: '#ffffff',
-		paddingLeft: '40rpx',
-		height: '78rpx',
-		paddingTop: '5px',
-		paddingBottom: '5px',
-		border: 'none'
+	
+	import type_01 from '@/static/images/messageNotification/type_01.png';
+	import type_02 from '@/static/images/messageNotification/type_02.png';
+	import type_03 from '@/static/images/messageNotification/type_03.png';
+	import type_04 from '@/static/images/messageNotification/type_04.png';
+	
+	const imageMap = {
+	  '01': type_01,
+	  '02': type_02,
+	  '03': type_03,
+	  '04': type_04,
 	};
-	const suffixIconStyle = {
-		color: '#2c8ef2',
-		fontSize: '50rpx'
-	};
-
+	
 	const status = ref('loadmore'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-  const limit = 20;
+	const limit = 20;
 	const total = ref(-1);
 	const page = ref(0);
 	const data_list = reactive([]);
@@ -135,7 +116,7 @@
 		page.data_list.length = 0;
 		getData();
 	};
-
+	
 	// 刷新处理函数
 	const onRefresh = () => {
 		if (_freshing.value) return;
@@ -317,7 +298,7 @@
 			.right {
 				margin-left: 16rpx;
 				flex: 1;
-
+				overflow: hidden;
 				.top {
 					display: flex;
 					justify-content: space-between;
@@ -356,6 +337,8 @@
 						text-align: left;
 						font-style: normal;
 						flex: 1;
+						width: 100%;
+						overflow: hidden;
 					}
 
 					.num_div {
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index a818c10a..71b96918 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -2,10 +2,12 @@
 	<view class="main_div max_page">
 		<nav-bar :is_seat="true"></nav-bar>
 		<view class="nav-div">
-			<view class="title ellipsis-text" @click="hand_in_paper_button_click()">
+			<view class="title ellipsis-text">
 				{{ paperData.name }}
 			</view>
-			<view class="back_div"></view>
+			<view class="back_div" @click="exit_practice">
+				<image :src="practiceExitIcon()" class="img"></image>
+			</view>
 		</view>
 		<view class="countdown-and-question-number-div">
 			<view class="top">
@@ -39,6 +41,7 @@
 				:current="questionNumber"
 				easing-function="linear"
 				@transition="transition"
+				@animationfinish="animationfinish"
 			>
 				<swiper-item v-for="(item, index) in topicList">
 					<view class="content">
@@ -71,7 +74,7 @@
 		<!-- 反馈组件 -->
 		<Feedback ref="feedbackRef"></Feedback>
 		<!-- 结尾弹出层 -->
-		<Dialog ref="dialogRef" :dialogConfiguration="dialogConfiguration" @button_click="result_click"></Dialog>
+		<Dialog ref="dialogRef" @button_click="result_click"></Dialog>
 	</view>
 </template>
 
@@ -87,7 +90,7 @@
 	import common from '@/common/common';
 	import { setPageCache, formatSeconds, getPageCache, setupKeyboardHeightListener } from '@/common/common';
 	import { commonUploadVoiceFile } from '@/api/common.js';
-	import { optionErrorIcon, examinationSheetIcon } from '@/common/imgSvg';
+	import { optionErrorIcon, examinationSheetIcon, practiceExitIcon } from '@/common/imgSvg';
 	import { practiceAnswer, practiceCommit, queryCrsPracticeAnswerResult } from '@/api/practice.js';
 	import { startExamByCrs } from '@/api/examination.js';
 	import { startPracticeByCrs } from '@/api/practice.js';
@@ -116,7 +119,6 @@
 		set: (val) => (topicList[questionNumber.value] = val)
 	});
 
-	const isLastTopic = computed(() => topicList.length === questionNumber.value + 1);
 	const showTouchBtn = computed(() => {
 		return topic.value?.qnsTyp === 'ES';
 	});
@@ -134,8 +136,6 @@
 		const completed = questionNumber.value + 1;
 		return Math.min(Math.round((completed / total) * 10000) / 100, 100);
 	});
-	// 弹出框配置
-	const dialogConfiguration = reactive({});
 
 	// 滑动切换
 	const swiperChange = (item) => {
@@ -143,10 +143,20 @@
 	};
 	const isTriggered = ref(false); // 下面这个得防抖
 	// 滑动发生改变
+	const finishCurrent = ref(questionNumber.value);
+	// 滑动组件结束事件
+	const animationfinish = (event) => {
+		finishCurrent.value = event.detail.current;
+	};
+	// 判断是否滑动结束
+	const isLastTopic = computed(
+		() => topicList.length === finishCurrent.value + 1 && finishCurrent.value === questionNumber.value
+	);
+
 	const transition = (event) => {
 		if (isTriggered.value) return;
 		const dx = event.detail.dx;
-		if (dx > 50 && isLastTopic.value && ['P', 'U'].includes(topic.value.judgeResult)) {
+		if (dx > 90 && dx < 250 && isLastTopic.value && ['P', 'U'].includes(topic.value.judgeResult)) {
 			// 如果是最后一题并且右滑动大于50,并且这题已经答了，就触发练习完成
 			isTriggered.value = true;
 			hand_in_paper_button_click();
@@ -222,7 +232,7 @@
 				const judgeResultStatus = traQnsInfoVo.judgeResult === 'P'; // P为正确U为错误
 				if (!addProblem()) {
 					// 返回false说明到了最后一题
-					console.log('最后一题');
+					console.log('最后一题', topic.value.qnsTyp, !judgeResultStatus);
 					if (topic.value.qnsTyp === 'ES' || !judgeResultStatus) {
 						// 最后一题是问答题，或者答错了，都不自动弹出
 						return;
@@ -319,11 +329,9 @@
 	// 添加一道题
 	const addProblem = () => {
 		if (topicList.length >= storageTopicList.value.length) {
-			console.log('最后一题了', storageTopicList.value.length);
 			return false;
 		}
 		topicList.push(storageTopicList.value[topicList.length]);
-		console.log('topicList', topicList);
 		return true;
 	};
 	// 初始化时检查
@@ -352,97 +360,80 @@
 		});
 	});
 	const result_click = async ({ key }) => {
-		isTriggered.value = false;
-		if (key === 'goto_test') {
-			// 去考试
-			try {
-				dialogRef.value.close();
-				await nextTick();
-				common.loading();
-				const res = await startExamByCrs({
-					crsId: paperData.crsId
-				});
-				setPageCache('examination', {
-					...res.body,
-					name: paperData.name,
-					crsId: paperData.crsId
-				});
-				common.hideLoading();
-				common.redirectTo('/pages/examination/index');
-			} catch (e) {
-				console.log('e', e);
-				common.navigateBack();
-			}
-		} else if (key === 'again') {
-			// 重新练
-			try {
-				dialogRef.value.close();
-				await nextTick();
-				common.loading();
-				const res = await startPracticeByCrs({
-					crsId: paperData.crsId
-				});
-				setPageCache('practice', {
-					...res.body,
-					name: paperData.name,
-					crsId: paperData.crsId
-				});
-				common.hideLoading();
-				common.redirectTo('/pages/practice/index');
-			} catch (e) {
-				console.log('e', e);
-				common.navigateBack();
-			}
-		} else if (key === 'return') {
-			// 返回
+		isTriggered.value = false; // 恢复
+		if (key === 'exit') {
+			// 中途退出
 			dialogRef.value.close();
+			common.loading();
+			await practiceCommit({ exrId: paperData.exrId, examLenTm: practiceTime.value, stat: 'U' });
+			common.hideLoading();
 			await nextTick();
 			common.navigateBack();
+		} else if (key === 'revert') {
+			// 返回
+			dialogRef.value.close();
 		}
 	};
-
+	const style_button_1 = {
+		color: '#FFFFFF',
+		fontSize: '30rpx',
+		backgroundColor: '#0066FF',
+		borderRadius: '8rpx'
+	};
+	const style_button_2 = {
+		color: '#0066FF',
+		fontSize: '30rpx',
+		backgroundColor: '#E2EDFF',
+		borderRadius: '8rpx'
+	};
+	// 弹出框配置
+	const dialogConfiguration = reactive({});
 	// 交卷按钮点击，打开交卷确认框
 	const hand_in_paper_button_click = async () => {
-		common.loading();
-		try {
-			await practiceCommit({ exrId: paperData.exrId, examLenTm: practiceTime.value, stat: 'P' });
-		} catch (e) {}
-		common.hideLoading();
-		console.log('点击交卷', paperData);
-		// 判断是否完成所有题目
-		const style_button_1 = {
-			color: '#FFFFFF',
-			fontSize: '30rpx',
-			backgroundColor: '#0066FF',
-			borderRadius: '8rpx'
-		};
-		const style_button_2 = {
-			color: '#0066FF',
-			fontSize: '30rpx',
-			backgroundColor: '#E2EDFF',
-			borderRadius: '8rpx'
-		};
+		console.log('交卷按钮');
+		const stat = 'P'
+		// 都做完弹窗了，产品说改成跳页，说客户觉得奇怪
+		common.redirectTo(`/pages/practice/result?name=${paperData.name}&exrId=${paperData.exrId}&crsId=${paperData.crsId}&examLenTm=${practiceTime.value}&stat=${stat}`);
 		// 完成
-		dialogConfiguration.type = 'complete';
-		dialogConfiguration.title = '恭喜你，已完成全部练习！';
-		dialogConfiguration.buttonList = [
-			{
-				key: 'goto_test',
-				name: '去考试',
-				style: style_button_1
-			},
-			{
-				key: 'again',
-				name: '重新练',
-				style: style_button_2
-			},
-			{
-				key: 'return',
-				name: '返回',
-				style: style_button_2
-			}
-		];
-		dialogRef.value.open();
+		// dialogRef.value.open({
+		// 	// type: 'complete',
+		// 	title: '恭喜你，已完成全部练习！',
+		// 	buttonList: [
+		// 		{
+		// 			key: 'goto_test',
+		// 			name: '去考试',
+		// 			style: style_button_1
+		// 		},
+		// 		{
+		// 			key: 'again',
+		// 			name: '重新练',
+		// 			style: style_button_2
+		// 		},
+		// 		{
+		// 			key: 'return',
+		// 			name: '返回',
+		// 			style: style_button_2
+		// 		}
+		// 	]
+		// });
+	};
+	// 中途退出
+	const exit_practice = () => {
+		dialogRef.value.open({
+			title: '确认现在退出吗？',
+			buttonList: [
+				{
+					key: 'exit',
+					name: '退出',
+					style: style_button_1
+				},
+				{
+					key: 'revert',
+					name: '返回',
+					style: style_button_2
+				}
+			]
+		});
 	};
 	// 启动练习时长定时器
 	const startTimer = () => {
@@ -748,6 +739,13 @@
 			top: 0;
 			width: 70rpx;
 			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.img {
+				width: 32rpx;
+				height: 32rpx;
+			}
 			// background-color: red;
 		}
 	}
diff --git a/src/pages/practice/result.vue b/src/pages/practice/result.vue
new file mode 100644
index 00000000..b7e5b847
--- /dev/null
+++ b/src/pages/practice/result.vue
@@ -0,0 +1,175 @@
+<template>
+	<view class="max_page">
+		<image src="@/static/images/common/wc.png" class="show_img"></image>
+		<view class="show_msg">练习完成</view>
+		<view class="fl1"></view>
+		<view class="show_button">
+			<uv-button
+				type="primary"
+				class="button"
+				color="#0066FF"
+				:throttleTime="100"
+				text="去考试"
+				:loading="loading === '01'"
+				loadingText="正在获取考试内容"
+				:custom-style="customStyle1"
+				@click="goto_examination"
+			></uv-button>
+			<uv-button
+				type="primary"
+				class="button"
+				color="#FFFFFF"
+				:throttleTime="100"
+				text="重新练"
+				:loading="loading === '02'"
+				loadingText="正在获取练习内容"
+				@click="goto_practice"
+				:custom-style="customStyle2"
+			></uv-button>
+			<uv-button
+				type="primary"
+				class="button"
+				color="#0066FF"
+				:throttleTime="100"
+				text="返回"
+				@click="back_page"
+				:custom-style="customStyle3"
+			></uv-button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { onLoad } from '@dcloudio/uni-app';
+	import { onMounted, ref, onUnmounted } from 'vue';
+	import common from '@/common/common';
+	import { setPageCache } from '@/common/common';
+	import { startExamByCrs } from '@/api/examination.js';
+	import { startPracticeByCrs } from '@/api/practice.js';
+	import { practiceCommit } from '@/api/practice.js';
+	const customStyle1 = {
+		borderRadius: '12rpx',
+		color: '#FFFFFF',
+		fontWeight: '600',
+		fontSize: '28rpx',
+		border: '1px solid #E0E0E0',
+		height: '92rpx'
+	};
+	const customStyle2 = {
+		borderRadius: '12rpx',
+		color: '#333333',
+		fontWeight: '600',
+		fontSize: '28rpx',
+		border: '1px solid #E0E0E0',
+		height: '92rpx'
+	};
+	const customStyle3 = {
+		color: '#333333',
+		fontWeight: '600',
+		fontSize: '28rpx',
+		border: 'none',
+		backgroundColor: '#fff',
+		height: '92rpx'
+	};
+	const crsId = ref('');
+	const name = ref('');
+	const loading = ref('');
+	
+	// 用于标记组件是否已卸载
+	let isUnmounted = false;
+	// 存储请求取消函数
+	let abortController = null;
+	// 返回上一页
+	const back_page = () => {
+		if (loading.value !== '') return;
+		common.navigateBack();
+	};
+	// 去考试
+	const goto_examination = async () => {
+		if (loading.value !== '') return;
+		try {
+			loading.value = '01';
+			const res = await startExamByCrs({
+				crsId: crsId.value
+			});
+			setPageCache('examination', {
+				...res.body,
+				name: name.value,
+				crsId: crsId.value
+			});
+			loading.value = '';
+			common.redirectTo('/pages/examination/index');
+		} catch (e) {
+			loading.value = '';
+		}
+	};
+	// 去练习
+	const goto_practice = async () => {
+		if (loading.value !== '') return;
+		try {
+			loading.value = '02';
+			const res = await startPracticeByCrs({
+				crsId: crsId.value
+			});
+			setPageCache('practice', {
+				...res.body,
+				name: name.value,
+				crsId: crsId.value
+			});
+			loading.value = '';
+			common.redirectTo('/pages/practice/index');
+		} catch (e) {
+			loading.value = '';
+		}
+	};
+	const exrId = ref('')
+	const examLenTm = ref('')
+	const stat = ref('')
+	const commit = ref(false)
+	onLoad((e) => {
+		crsId.value = e.crsId
+		name.value = e.name
+		exrId.value = e.exrId
+		examLenTm.value = e.examLenTm
+		stat.value = e.stat
+		practiceCommitFun()
+	});
+	const practiceCommitFun = () => {
+		practiceCommit({ exrId: exrId.value, examLenTm: examLenTm.value, stat: stat.value }).then(() => {
+			console.log('提交练习状态成功');
+			commit.value = true
+		})
+	}
+	
+	onUnmounted(() => {});
+</script>
+
+<style scoped lang="scss">
+	.max_page {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+	}
+	.show_img {
+		margin-top: 300rpx;
+		width: 231rpx;
+		height: 231rpx;
+	}
+	.show_msg {
+		margin-top: 38rpx;
+		font-weight: 700;
+		font-size: 46rpx;
+		color: #000000;
+		line-height: 62rpx;
+		text-align: center;
+		font-style: normal;
+	}
+	.show_button {
+		width: 80%;
+		margin-bottom: 90rpx;
+		.button:nth-child(2) {
+			margin-top: 38rpx;
+			margin-bottom: 38rpx;
+		}
+	}
+</style>
diff --git a/src/pages/preview/components/previewCourse.vue b/src/pages/preview/components/previewCourse.vue
index 5c6c07b8..2a83fe07 100644
--- a/src/pages/preview/components/previewCourse.vue
+++ b/src/pages/preview/components/previewCourse.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="scroll_div">
 		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<view class="item" v-for="item in data_list" @click="item_click(item)">
+			<view class="item" v-for="item in data_list" @click="goto_course_detail(item)">
 				<view class="img_div">
 					<image-preview class="img" :imgId="item.imgId" mode="scaleToFill"></image-preview>
 				</view>
@@ -23,6 +23,7 @@
 	const limit = 15;
 	const total = ref(-1);
 	const page = ref(0);
+	import common from '@/common/common';
 	const data_list = reactive([]);
 	import { ref, reactive, onMounted, nextTick } from 'vue';
 	import { queryTraStdyInfoPreviewPaging } from '@/api/preview.js';
@@ -59,9 +60,8 @@
 	const scrolltolower = (item) => {
 		getData();
 	};
-	const item_click = (item) => {
-		console.log(item, 'item');
-		crsId
+	const goto_course_detail = (item) => {
+		common.navigateTo('/pages/courseDetail/index?isPreview=preview&crsId=' + item.crsId);
 	};
 
 	defineExpose({
diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue
index 0110cd46..3803d78b 100644
--- a/src/pages/setting/index.vue
+++ b/src/pages/setting/index.vue
@@ -31,8 +31,8 @@
 						</picker>
 					</template>
 				</uv-cell>
-				<uv-cell title="百禄形象" @click="gotoMascot()" :isLink="true"></uv-cell>
-				<uv-cell :isLink="true" :border="false">
+				<uv-cell title="百禄形象" @click="gotoMascot()" :isLink="true" :border="false"></uv-cell>
+			<!-- 	<uv-cell :isLink="true" :border="false">
 					<template #title>
 						<text class="font_pf">竞赛是否匿名</text>
 					</template>
@@ -42,7 +42,7 @@
 							<view style="text-align: right">{{showAnonymousText}}</view>
 						</picker>
 					</template>
-				</uv-cell>
+				</uv-cell> -->
 			</uv-cell-group>
 		</view>
 		<avatar-cropper v-if="avatarCropperStatus" mode="ratio" :imageUrl="avatarCropperUrl" :width="500" :height="500"
diff --git a/src/pages/wrongQuestionRecord/components/correct.vue b/src/pages/wrongQuestionRecord/components/correct.vue
index 9ae4005c..1e2bd0f7 100644
--- a/src/pages/wrongQuestionRecord/components/correct.vue
+++ b/src/pages/wrongQuestionRecord/components/correct.vue
@@ -1,168 +1,77 @@
 <template>
-	<view class="scroll_div content">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower">
-			<view class="item" :class="getStatusClass(index)" v-for="(item,index) in data_list">
-				<view class="top">
-					<view class="type">
-						单选题
-					</view>
-					<view class="score">
-						5分
-					</view>
-					<view class="fl1">
-
-					</view>
-					<view class="right">
-						<view class="right_text">
-							展开
-						</view>
-						<uv-icon class="arrow-icon" name="arrow-right"></uv-icon>
-					</view>
-				</view>
-				<view class="text">
-					属于商业银行风险管理“三道防线”的哪些风险管理部门，为什么？
-				</view>
+	<view class="max_page detail-main">
+		<scroll-view :scroll-y="true" class="scroll-Y" :show-scrollbar="false" @scrolltolower="scrolltolower">
+			<view class="content" v-for="(item, index) in data_list">
+				<subject :item="item" mode="mistake" :isPreview="true" :clearResult="false"></subject>
 			</view>
+			<list-no-data v-if="total == 0 && status == 'nomore'"></list-no-data>
 			<uv-load-more v-if="total != 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
 		</scroll-view>
 	</view>
 </template>
 <script setup>
-	const status = ref('loading') // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-  const limit = 20;
-	const total = ref(-1)
-	const page = ref(0)
-	const data_list = reactive([])
-	import {
-		ref,
-		reactive,
-		onMounted,
-		nextTick
-	} from 'vue'
-	import {
-		queryTraCrsBbsInfoByCrsId
-	} from '@/api/courseDetail.js';
+	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
+	const limit = 20;
+	const total = ref(-1);
+	const page = ref(0);
+	const data_list = reactive([]);
+	import { ref, reactive, onMounted, nextTick } from 'vue';
+	import { queryTraCrsBbsInfoByCrsId } from '@/api/courseDetail.js';
+	import { queryTraMistakesCollectionPaging } from '@/api/wrongQuestionRecord.js';
+	import Subject from '@/components/examination/subject.vue';
 	const getData = (from = '') => {
 		if (from == 'first') {
 			if (total.value !== -1) {
-				return
+				return;
 			}
-			status.value = 'loading'
-			total.value = -1
-			page.value = 1
-			data_list.length = 0
+			status.value = 'loading';
+			total.value = -1;
+			page.value = 1;
+			data_list.length = 0;
 		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return
-			status.value = 'loading'
-			page.value++
+			if (status.value !== 'loadmore' && status.value !== '') return;
+			status.value = 'loading';
+			page.value++;
 		}
-		console.log(status.value, '阿斯顿撒');
-
 		setTimeout(() => {
-			queryTraCrsBbsInfoByCrsId({
-				crsId: 'CRS0250181220722025070408313900000018729',
+			queryTraMistakesCollectionPaging({
+				isCorrect: 'Y',
 				page: page.value,
 				limit: limit
-			}).then(res => {
-				total.value = res.total
-				data_list.push(...res.body)
-			}).finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore'
-				} else {
-					status.value = 'loadmore'
-				}
 			})
-		}, 200)
-	}
-	const getStatusClass = (index) => {
-		const remainder = index % 3;
-		if (remainder === 0) return 'in_progress';
-		if (remainder === 1) return 'completed';
-		return 'expired';
+				.then((res) => {
+					total.value = res.total;
+					data_list.push(...res.body);
+				})
+				.finally(() => {
+					if (data_list.length >= total.value) {
+						status.value = 'nomore';
+					} else {
+						status.value = 'loadmore';
+					}
+				});
+		}, 200);
 	};
+	
 	const scrolltolower = (item) => {
-		getData()
+		getData();
 	};
 	defineExpose({
 		getData
-	})
+	});
 </script>
 
 <style scoped lang="scss">
-	
-	.scroll_div {
-		background-color: #F1F5FA;
-		padding: 22rpx;
-	}
-
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 44rpx);
-		// background-color: #fff;
-
-	}
-
-	.scroll-Y .item {
-		// height: 170rpx;
+	$bg-margin-left: 30rpx;
+	.content {
+		position: relative;
+		margin: 32rpx $bg-margin-left;
 		border-radius: 16rpx;
-		margin: 32rpx 0;
 		padding: 34rpx 30rpx 34rpx 36rpx;
 		background-color: #fff;
-		display: flex;
-		flex-direction: column;
-
-		.top {
-			display: flex;
-			align-items: center;
-
-			.type {
-				width: 108rpx;
-				height: 46rpx;
-				background: #267EFF;
-				border-radius: 8rpx;
-				font-family: PingFangSC;
-				font-weight: 500;
-				font-size: 25rpx;
-				color: #FFFFFF;
-				text-align: center;
-				line-height: 46rpx;
-			}
-
-			.score {
-				margin-left: 24rpx;
-				font-family: ArialMT;
-				font-size: 30rpx;
-				color: #333333;
-				text-align: left;
-			}
-
-			.right {
-				display: flex;
-				align-items: center;
-
-				.right_text {
-					font-family: PingFangSC;
-					font-weight: 600;
-					font-size: 28rpx;
-					color: #333;
-					line-height: 40rpx;
-					text-align: left;
-					font-style: normal;
-				}
-
-			}
-		}
-
-		.text {
-			font-family: PingFangSC;
-			font-weight: 500;
-			font-size: 30rpx;
-			color: #333333;
-			line-height: 48rpx;
-			text-align: left;
-			font-style: normal;
-			margin-top: 20rpx;
-		}
-
 	}
-</style>
\ No newline at end of file
+	.scroll-Y {
+		background-color: #f1f5fa;
+		max-height: calc(100vh - var(--status-bar-height) - 78rpx - 88rpx - 156rpx);
+	}
+</style>
diff --git a/src/pages/wrongQuestionRecord/components/favorites-course.vue b/src/pages/wrongQuestionRecord/components/favorites-course.vue
index 60da27d7..2257c235 100644
--- a/src/pages/wrongQuestionRecord/components/favorites-course.vue
+++ b/src/pages/wrongQuestionRecord/components/favorites-course.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view :scroll-y="true" class="scroll-Y " :show-scrollbar="false" @scrolltolower="scrolltolower">
+	<view class="max_page detail-main">
+		<scroll-view :scroll-y="true" class="scroll-Y" :show-scrollbar="false" @scrolltolower="scrolltolower">
 			<view class="content" v-for="(item, index) in data_list">
 				<subject :item="item" mode="mistake" :isPreview="true" :clearResult="false"></subject>
 			</view>
@@ -11,7 +11,7 @@
 </template>
 <script setup>
 	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-  const limit = 20;
+	const limit = 20;
 	const total = ref(-1);
 	const page = ref(0);
 	const data_list = reactive([]);
@@ -52,12 +52,7 @@
 				});
 		}, 200);
 	};
-	const getStatusClass = (index) => {
-		const remainder = index % 3;
-		if (remainder === 0) return 'in_progress';
-		if (remainder === 1) return 'completed';
-		return 'expired';
-	};
+	
 	const scrolltolower = (item) => {
 		getData();
 	};
@@ -74,10 +69,9 @@
 		border-radius: 16rpx;
 		padding: 34rpx 30rpx 34rpx 36rpx;
 		background-color: #fff;
-		// min-height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 44rpx - 156rpx);
 	}
 	.scroll-Y {
 		background-color: #f1f5fa;
-		min-height: calc(100vh - var(--status-bar-height) - 78rpx - 88rpx - 156rpx);
+		max-height: calc(100vh - var(--status-bar-height) - 78rpx - 88rpx - 156rpx);
 	}
 </style>
diff --git a/src/pages/wrongQuestionRecord/correct.vue b/src/pages/wrongQuestionRecord/correct.vue
new file mode 100644
index 00000000..f3ef5606
--- /dev/null
+++ b/src/pages/wrongQuestionRecord/correct.vue
@@ -0,0 +1,737 @@
+<template>
+	<view class="main_div max_page">
+		<nav-bar :is_seat="true"></nav-bar>
+		<view class="nav-div">
+			<view class="title ellipsis-text">
+				{{ paperData.name }}
+			</view>
+			<view class="back_div" @click="exit_practice">
+				<image :src="practiceExitIcon()" class="img"></image>
+			</view>
+		</view>
+		<view class="countdown-and-question-number-div">
+			<view class="top">
+				<view class="countdown">
+					<text class="grey">答题进度</text>
+					<text class="bold">{{ questionNumber + 1 }}</text>
+					<text class="grey">/{{ storageIdList.length }}</text>
+				</view>
+				<view class="question"></view>
+			</view>
+			<view class="progress">
+				<uv-line-progress
+					:percentage="progress"
+					:showText="false"
+					activeColor="#FFFFFF"
+					inactiveColor="#89B8FF"
+					:height="8"
+				></uv-line-progress>
+			</view>
+		</view>
+		<view class="scroll_div">
+			<swiper
+				class="swiper"
+				:indicator-dots="false"
+				@change="swiperChange"
+				:current="questionNumber"
+				easing-function="linear"
+				@transition="transition"
+				@animationfinish="animationfinish"
+			>
+				<swiper-item v-for="(item, index) in topicList">
+					<view class="content">
+						<view class="expose_shadow"></view>
+						<scroll-view :scroll-y="true" class="scroll-Y" :show-scrollbar="false" :refresher-threshold="0">
+							<Subject
+								:item="item"
+								:mode="mode"
+								:isPreview="item.isPreview"
+								:clearResult="item.clearResult"
+								@subject_click="subject_click"
+								v-model="item.my_answer"
+							></Subject>
+						</scroll-view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="fixed-box font_pf" :style="{ marginBottom: popup_input_bottom }">
+			<view class="touch-btn-div" :class="{ show: showTouchBtn }">
+				<TouchBtn
+					ref="touchBtnRef"
+					class="talk-btns"
+					@submit="touchBtnSubmit"
+					disabledText="只能进行一条回答"
+					:isDisabled="touchIsDisabled"
+				/>
+			</view>
+		</view>
+		<!-- 反馈组件 -->
+		<Feedback ref="feedbackRef"></Feedback>
+		<!-- 结尾弹出层 -->
+		<Dialog ref="dialogRef" @button_click="result_click"></Dialog>
+	</view>
+</template>
+
+<script setup>
+	import { ref, reactive, computed, onMounted, nextTick, onUnmounted } from 'vue';
+	import { onLoad, onHide, onShow, onUnload } from '@dcloudio/uni-app';
+
+	import Feedback from '@/pages/examination/components/feedback.vue';
+	import Dialog from '@/pages/examination/components/dialog.vue';
+	import Subject from '@/components/examination/subject.vue';
+	import CharactersSubject from '@/components/examination/characters-subject.vue';
+	import TouchBtn from '@/components/examination/touchBtn.vue';
+	import common from '@/common/common';
+	import { setPageCache, getPageCache, setupKeyboardHeightListener } from '@/common/common';
+	import { commonUploadVoiceFile } from '@/api/common.js';
+	import { optionErrorIcon, examinationSheetIcon, practiceExitIcon } from '@/common/imgSvg';
+	import { practiceAnswer, practiceCommit, queryCrsPracticeAnswerResult } from '@/api/practice.js';
+
+	import { queryMistakesAnswerByMisId, mistakesCorrect } from '@/api/wrongQuestionRecord.js';
+	const feedbackRef = ref(null);
+	const dialogRef = ref(null);
+	const touchBtnRef = ref(null);
+
+
+
+	const mode = ref('practice'); // 考试 examination 练习practice
+	const paperData = reactive({
+		name: '' // 名称
+	}); // 试卷信息
+	const topicList = reactive([]); // 问题列表
+	const storageIdList = ref([]); // 所有题ID列表
+	const popup_input_bottom = ref('0px');
+	const questionNumber = ref(0); // 题号
+	
+
+	const topic = computed({
+		get: () => topicList[questionNumber.value],
+		set: (val) => (topicList[questionNumber.value] = val)
+	});
+	
+	const showTouchBtn = computed(() => {
+		return topic.value?.qnsTyp === 'ES';
+	});
+
+	// 下面语音组件的禁用状态判断
+	const touchIsDisabled = computed(() => {
+		console.log('下面语音组件的禁用状态判断', topic.value?.es_status !== '' && topic.value?.es_status !== undefined);
+		return topic.value?.es_status !== '' && topic.value?.es_status !== undefined;
+	});
+
+	const progress = computed(() => {
+		// 计算进度百分比（保留两位小数）
+		const total = storageIdList.value.length;
+		if (total === 0) return 0;
+		const completed = questionNumber.value + 1;
+		return Math.min(Math.round((completed / total) * 10000) / 100, 100);
+	});
+
+	// 滑动切换
+	const swiperChange = (item) => {
+		questionNumber.value = item.detail.current;
+	};
+	const isTriggered = ref(false); // 下面这个得防抖
+	// 滑动发生改变
+	const finishCurrent = ref(questionNumber.value);
+	// 滑动组件结束事件
+	const animationfinish = (event) => {
+		finishCurrent.value = event.detail.current;
+	};
+	// 判断是否滑动结束
+	const isLastTopic = computed(
+		() => topicList.length === finishCurrent.value + 1 && finishCurrent.value === questionNumber.value
+	);
+
+	const transition = (event) => {
+		if (isTriggered.value) return;
+		const dx = event.detail.dx;
+		if (dx > 50 && dx < 200 && isLastTopic.value && ['P', 'U'].includes(topic.value.judgeResult)) {
+			// 如果是最后一题并且右滑动大于50,并且这题已经答了，就触发练习完成
+			isTriggered.value = true;
+			hand_in_paper_button_click();
+		}
+	};
+
+	const subject_click = (type, params) => {
+		if (type === 'feedback') {
+			// 反馈
+			feedbackRef.value.open(params.qnsId);
+		} else if (type === 'answer') {
+			//多选点击按钮答题
+			if (params.qnsTyp === 'MU') {
+				submitProblem({
+					anserResult: params.answer.join(',')
+				});
+			}
+		} else if (type === 'choose') {
+			//单选判断点击选项答题
+			if (['JD', 'SN'].includes(params.qnsTyp)) {
+				submitProblem({ anserResult: params.answer.join(',') });
+			}
+		} else if (type === 'complete') {
+			// 问答题点击完成
+			// ossAddr
+			// anserResult 作答结果
+			// ossKey 对象存储
+			submitProblem(params.answer);
+		} else if (type === 'again') {
+			// 问答题点击重答
+			topic.value.my_answer = {};
+			topic.value.isPreview = false;
+			topic.value.es_status = ''; // 取消转圈
+		}
+	};
+
+	// 单题回答
+	const submitProblem = (answer) => {
+		console.log('答题内容', answer);
+		console.log('答单题', topic);
+		common.loading('答题中');
+		mistakesCorrect({
+			misId: topic.value.misId,
+			ossKey: '',
+			...answer
+		})
+			.then(async (res) => {
+				let traQnsInfoVo;
+				// 是问答题
+				if (topic.value.qnsTyp === 'ES') {
+					try {
+						const result = await queryWithRetry(res.body.execLogId);
+						traQnsInfoVo = result.body.traQnsInfoVo;
+					} catch (e) {
+						common.hideLoading();
+						topic.value.isPreview = false;
+						return;
+					}
+				} else {
+					traQnsInfoVo = res.body;
+				}
+				topic.value.isPreview = true; // 不能在点击了，打开预览模式
+				console.log('给出来的traQnsInfoVo', traQnsInfoVo);
+				common.hideLoading();
+				topic.value.clearResult = false; // 不清除正确答案
+				topic.value.analyContent = traQnsInfoVo.analyContent; // 答案解析
+				// 更新选项正确项目
+				topic.value.itemVos = traQnsInfoVo.itemVos; // 答案选项（todo应该不这样替换）
+				topic.value.anserResult = traQnsInfoVo.anserResult; // 正确答案字符串分割
+				topic.value.judgeResult = traQnsInfoVo.judgeResult; // 正确答案字符串分割
+				const judgeResultStatus = traQnsInfoVo.judgeResult === 'P'; // P为正确U为错误
+				// 加载下一题
+				addProblem(questionNumber.value + 1)
+				
+				// if (!addProblem()) {
+				// 	// 返回false说明到了最后一题
+				// 	console.log('最后一题', topic.value.qnsTyp, !judgeResultStatus);
+				// 	if (topic.value.qnsTyp === 'ES' || !judgeResultStatus) {
+				// 		// 最后一题是问答题，或者答错了，都不自动弹出
+				// 		return;
+				// 	} else {
+				// 		await hand_in_paper_button_click();
+				// 	}
+				// } else {
+				// 	// 自动切换下一题的条件
+				// 	if (
+				// 		judgeResultStatus && // 条件1.答题正确
+				// 		topic.value.qnsTyp !== 'ES' // 问答题答对打答错都不切换
+				// 	) {
+				// 		questionNumber.value++;
+				// 	} else {
+				// 		console.log('为什么不跳转2', judgeResultStatus);
+				// 		console.log('为什么不跳转3', topic.value.qnsTyp !== 'ES');
+				// 	}
+				// }
+			})
+			.catch(() => {
+				common.hideLoading();
+			});
+	};
+
+	// 问答题轮询结果方法
+	const queryWithRetry = (execLogId, maxRetries = 10) => {
+		// 递归终止条件：达到最大重试次数
+		if (maxRetries <= 0) {
+			return Promise.reject(new Error('超过最大重试次数，查询失败'));
+		}
+		return queryCrsPracticeAnswerResult({ execLogId })
+			.then((res) => {
+				console.log('queryCrsPracticeAnswerResult', maxRetries, res.body);
+				const isWait = res.body.isWait;
+				if (isWait === 'Y') {
+					// 如果是Y，延迟2秒后重试，重试次数减1
+					return new Promise((resolve) => {
+						setTimeout(() => {
+							resolve(queryWithRetry(execLogId, maxRetries - 1));
+						}, 2000);
+					});
+				} else {
+					// 不是Y，直接返回结果
+					return res;
+				}
+			})
+			.catch((error) => {
+				// 对接口调用错误进行重试
+				if (maxRetries > 0) {
+					return new Promise((resolve) => {
+						setTimeout(() => {
+							resolve(queryWithRetry(execLogId, maxRetries - 1));
+						}, 2000);
+					});
+				}
+				return Promise.reject(error);
+			});
+	};
+	// 录音组件提交
+	const touchBtnSubmit = (type, submitObj) => {
+		const old_text = touchBtnRef.value?.clearinputText(); // 清除发送框数据
+
+		if (type === 'voice') {
+			topic.value.es_status = '00'; // 00转圈
+			const voicePath = submitObj;
+			commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
+				.then((res) => {
+					let _res = JSON.parse(res.data);
+					if (_res.rtnCode === '0000') {
+						topic.value.es_status = '02';
+						topic.value.my_answer = {
+							anserResult: _res.body.transContent,
+							ossKey: _res.body.fileId,
+							ossAddr: _res.body.ossFileAddr,
+							voicePath: voicePath
+						};
+					}
+				})
+				.catch((err) => {
+					topic.value.es_status = ''; // 取消转圈
+					// 失败了再把发送框数据还原回去
+					touchBtnRef.value?.clearinputText(old_text); // 清除发送框数据
+					common.msg('系统异常，请联系管理员');
+				});
+		} else if (type === 'text') {
+			topic.value.es_status = '01';
+			topic.value.my_answer = {
+				anserResult: submitObj // 正确答案文字内容
+			};
+		}
+	};
+	
+	// 添加一道题
+	const addProblem = async (index, isLoading) => {
+		// index 要加载的题号 isLoading是否显示loading
+		if(index < topicList.length) return true; // 说明此题已经加载
+		if (topicList.length >= storageIdList.value.length) return false; // 说明已经就
+		if (isLoading) common.loading('加载题目中');
+		const id = storageIdList.value[index];
+		queryMistakesAnswerByMisId({ misId: id })
+			.then(({ body }) => {
+				console.log('加载了一道题', body);
+				topicList.push({
+					...body,
+					isPreview: false,
+					clearResult: true,
+					es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
+					my_answer: []
+				});
+			})
+			.finally(() => {
+				if (isLoading) common.hideLoading();
+			});
+	};
+	// 初始化时检查
+	onLoad(() => {
+		const correct = getPageCache('correct');
+		if (!correct) {
+			return common.navigateBack();
+		}
+		paperData.name = correct.name;
+		storageIdList.value = correct.list;
+		// 记录练习起始时间
+		setupKeyboardHeightListener((height) => {
+			popup_input_bottom.value = `${height}px`;
+		});
+		setTimeout(() => {
+			addProblem(0, true);
+		}, 10);
+	});
+	const result_click = async ({ key }) => {
+		isTriggered.value = false; // 恢复
+		if (key === 'return') {
+			// 返回
+			dialogRef.value.close();
+			await nextTick();
+			common.navigateBack();
+		} else if (key === 'exit') {
+			// 中途退出
+			dialogRef.value.close();
+			common.loading();
+			await practiceCommit({ exrId: paperData.exrId, stat: 'U' });
+			common.hideLoading();
+			await nextTick();
+			common.navigateBack();
+		} else if (key === 'revert') {
+			// 返回
+			dialogRef.value.close();
+		}
+	};
+	const style_button_1 = {
+		color: '#FFFFFF',
+		fontSize: '30rpx',
+		backgroundColor: '#0066FF',
+		borderRadius: '8rpx'
+	};
+	const style_button_2 = {
+		color: '#0066FF',
+		fontSize: '30rpx',
+		backgroundColor: '#E2EDFF',
+		borderRadius: '8rpx'
+	};
+	// 弹出框配置
+	const dialogConfiguration = reactive({});
+	// 交卷按钮点击，打开交卷确认框
+	const hand_in_paper_button_click = async () => {
+		console.log('交卷按钮');
+		common.loading();
+		try {
+			await practiceCommit({ exrId: paperData.exrId, stat: 'P' });
+		} catch (e) {}
+		common.hideLoading();
+		console.log('点击交卷', paperData);
+		// 完成
+		dialogRef.value.open({
+			// type: 'complete',
+			title: '恭喜你，已完成全部练习！',
+			buttonList: [
+				{
+					key: 'goto_test',
+					name: '去考试',
+					style: style_button_1
+				},
+				{
+					key: 'again',
+					name: '重新练',
+					style: style_button_2
+				},
+				{
+					key: 'return',
+					name: '返回',
+					style: style_button_2
+				}
+			]
+		});
+	};
+
+	// 中途退出
+	const exit_practice = () => {
+		dialogRef.value.open({
+			title: '确认现在退出吗？',
+			buttonList: [
+				{
+					key: 'exit',
+					name: '退出',
+					style: style_button_1
+				},
+				{
+					key: 'revert',
+					name: '返回',
+					style: style_button_2
+				}
+			]
+		});
+	};
+
+	onShow(() => {});
+	onHide(() => {});
+	onUnload(() => {});
+</script>
+
+<style scoped lang="scss">
+	$bg-margin-left: 30rpx;
+
+	.popup_title_text {
+		color: red;
+	}
+
+	.popup {
+		//答题卡
+		z-index: 1800;
+		padding: 0 38rpx;
+
+		.sheet_popup_div {
+			width: 100%;
+			height: 100%;
+			background-color: #ffffff;
+			padding: 10rpx 34rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			border-radius: 16rpx 16rpx 0px 0px;
+			position: relative;
+
+			.title_div {
+				width: 100%;
+				text-align: center;
+				padding: 30rpx 0;
+				font-family: PingFangSC;
+				font-weight: 600;
+				font-size: 34rpx;
+				color: #000000;
+				text-align: center;
+				font-style: normal;
+				border-bottom: 2rpx solid #efefef;
+			}
+
+			.popup_back_div {
+				width: 60rpx;
+				height: 60rpx;
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.img {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+
+			.sheet_table {
+				margin-top: 48rpx;
+				margin-bottom: 48rpx;
+				display: flex;
+				flex-wrap: wrap;
+				width: calc(100vw - 108rpx);
+				align-content: space-between;
+
+				.sheet_table_item {
+					width: calc((100vw - 108rpx) / 5 - 16rpx);
+					height: calc((100vw - 108rpx) / 5 - 16rpx);
+					margin: 8rpx;
+					border: 2rpx solid #e5e5e5;
+					border-radius: 50%;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 32rpx;
+					color: #999999;
+				}
+
+				.current {
+					background-color: rgba(0, 102, 255, 0.6);
+					border-color: #0066ff;
+					color: #ffffff;
+				}
+
+				.completed {
+					// 已完成
+					background-color: rgba(0, 102, 255, 0.1);
+					border-color: #0066ff;
+					color: #0066ff;
+				}
+
+				.mark,
+				.completed.mark {
+					background-color: rgba(232, 181, 49, 0.1);
+					color: #e8b531;
+					border-color: #e8b531;
+				}
+
+				.current.mark {
+					// 已完成
+					background-color: rgba(0, 102, 255, 0.6);
+					color: #ffffff;
+					border-color: #e8b531;
+				}
+			}
+
+			.sheet_button {
+				width: 100%;
+			}
+		}
+	}
+
+	.fixed-box {
+		position: fixed;
+		width: 100%;
+		left: 0;
+		bottom: 0;
+		border-radius: 16rpx 16rpx 0px 0px;
+		border: 2rpx solid #e5e5e5;
+		background: #ffffff;
+	}
+
+	.touch-btn-div {
+		height: 0;
+		overflow: hidden;
+		transition: height 0.2s ease-out;
+	}
+
+	.touch-btn-div.show {
+		height: 150rpx;
+	}
+
+	.fixed-btn-box {
+		height: 154rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 20rpx 20rpx 20rpx;
+
+		.sheet_button {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin: 0 70rpx;
+
+			.img {
+				width: 38rpx;
+				height: 40rpx;
+			}
+
+			.sheet_text {
+				margin-top: 8rpx;
+				font-family: PingFangSC;
+				font-weight: 500;
+				font-size: 24rpx;
+				color: #000000;
+			}
+		}
+
+		.button_div {
+			flex: 1;
+
+			display: flex;
+			justify-content: space-between;
+
+			.button {
+				flex: 1;
+			}
+		}
+	}
+
+	.scroll-Y {
+		max-height: calc(100vh - var(--status-bar-height) - 70rpx - 70rpx - 40rpx - 64rpx - 68rpx - 60rpx);
+		min-height: calc(100vh - var(--status-bar-height) - 70rpx - 70rpx - 40rpx - 64rpx - 68rpx - 60rpx - 380rpx);
+	}
+
+	.swiper {
+		// 状态栏 var(--status-bar-height)
+		// 标题栏 70rpx
+		// 进度时间栏 70rpx
+		// 进度时间栏上下间距 40rpx = 20rpx + 20rpx
+		// 正文上下间距 64rpx
+		height: calc(100vh - var(--status-bar-height) - 70rpx - 70rpx - 40rpx - 64rpx);
+		// background-color: red;
+	}
+
+	.content {
+		position: relative;
+		margin: 32rpx $bg-margin-left;
+		border-radius: 16rpx;
+		padding: 34rpx 30rpx 34rpx 36rpx;
+		background-color: #fff;
+
+		.expose_shadow {
+			margin-left: 36rpx;
+			position: absolute;
+			bottom: -26rpx;
+			left: 0%;
+			width: calc(100% - 66rpx);
+			height: 28rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 14rpx 14rpx;
+			opacity: 0.4;
+			z-index: 0;
+			// background-color: red;
+		}
+	}
+
+	.countdown-and-question-number-div {
+		margin: 20rpx $bg-margin-left;
+		height: 70rpx;
+		// background-color: red;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		z-index: 10;
+
+		.top {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-family: PingFangSC;
+			font-size: 26rpx;
+			color: #ffffff;
+			text-align: left;
+			font-style: normal;
+		}
+
+		.question {
+			display: flex;
+			align-items: center;
+			// background-color: red;
+			width: 242rpx;
+
+			.grey {
+				margin-right: 8rpx;
+			}
+			color: #ffffff;
+			font-weight: 600;
+			font-size: 26rpx;
+		}
+
+		.grey {
+			color: #b6e2ff;
+		}
+
+		.bold {
+			font-weight: 600;
+		}
+	}
+
+	.nav-div {
+		position: relative;
+
+		.title {
+			// padding-top:var(--status-bar-height);
+			// padding: 0 30rpx;
+			margin: 0 calc($bg-margin-left + 70rpx);
+			height: 70rpx;
+			font-family: PingFangSC;
+			font-weight: 500;
+			font-size: 34rpx;
+			color: #ffffff;
+			text-align: center;
+			font-style: normal;
+			line-height: 70rpx;
+		}
+
+		.back_div {
+			position: absolute;
+			right: $bg-margin-left;
+			top: 0;
+			width: 70rpx;
+			height: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.img {
+				width: 32rpx;
+				height: 32rpx;
+			}
+			// background-color: red;
+		}
+	}
+
+	.main_div {
+		display: flex;
+		flex-direction: column;
+		background: linear-gradient(to top, #3480ff, #0066ff);
+		/* 确保背景占满整个视口高度 */
+		min-height: 100vh;
+		margin: 0;
+	}
+</style>
diff --git a/src/pages/wrongQuestionRecord/index.vue b/src/pages/wrongQuestionRecord/index.vue
index 428852d4..4e315163 100644
--- a/src/pages/wrongQuestionRecord/index.vue
+++ b/src/pages/wrongQuestionRecord/index.vue
@@ -22,7 +22,13 @@
 				></uv-tabs>
 			</view>
 			<view class="uni-margin-wrap no-overflow">
-				<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
+				<swiper
+					class="swiper"
+					:current="tabAct"
+					:indicator-dots="false"
+					:disable-touch="true"
+					@change="swiperChange"
+				>
 					<swiper-item>
 						<FavoritesCourse ref="courseRef"></FavoritesCourse>
 					</swiper-item>
@@ -32,18 +38,16 @@
 				</swiper>
 			</view>
 		</view>
-		<view class="fixed-box">
+		<view class="fixed-box" :class="{ 'fixed-box-hidden': tabAct === 1 }">
 			<uv-button
+				@click="redo_subject"
 				type="primary"
 				class="send_evaluate"
 				color="#0066FF"
 				:throttleTime="100"
-				text='重做错题'
+				text="重做错题"
 				:custom-style="customStyle"
-				
-			>
-				
-			</uv-button>
+			></uv-button>
 		</view>
 	</view>
 </template>
@@ -54,14 +58,15 @@
 	// 我的收藏
 	import { reactive, ref, computed, nextTick, onMounted, watch } from 'vue';
 	import { LineBg } from '@/enum.js';
-	import { queryTraCrsBbsInfoByCrsId, replyTraCrsBbsInfo, qryChildTraCrsBbsInfo } from '@/api/courseDetail.js';
-
+	import { queryMistakesAnswerByMisId, queryTraMistakesCollection } from '@/api/wrongQuestionRecord.js';
 	import common from '@/common/common';
+	import { setPageCache } from '@/common/common';
+	
 	const customStyle = {
 		borderRadius: '16rpx'
-	}
+	};
 	const statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
-	
+
 	const courseRef = ref(null);
 	const correctRef = ref(null);
 	const tabAct = ref(0);
@@ -80,6 +85,23 @@
 	const swiperChange = (item) => {
 		tabAct.value = item.detail.current;
 	};
+	const redo_subject = async () => {
+		// 重做错题
+
+		common.loading();
+		queryTraMistakesCollection()
+			.then((res) => {
+				setPageCache('correct', {
+					list: res.body,
+					name: '错题本'
+				});
+				common.navigateTo('/pages/wrongQuestionRecord/correct');
+			})
+			.finally(() => {
+				common.hideLoading();
+			});
+	};
+
 	onMounted(() => {
 		watch(
 			tabAct,
@@ -99,24 +121,29 @@
 
 <style lang="scss" scoped>
 	$bg-margin-left: 50rpx;
-	
+	.fixed-box-hidden {
+		height: 0 !important;
+	}
+
 	.fixed-box {
+		height: 156rpx;
+		overflow: hidden; /* 关键：隐藏超出部分 */
+		transition: height 0.3s ease-out;
 		position: fixed;
 		width: 100%;
 		left: 0;
 		bottom: 0;
 		border-radius: 16rpx 16rpx 0px 0px;
-		border: 2rpx solid #E5E5E5;
-		background: #FFFFFF;
+		border: 2rpx solid #e5e5e5;
+		background: #ffffff;
 		overflow: hidden;
-		box-shadow: 0 2rpx 2rpx #E5E5E5;
-		.send_evaluate{
+		box-shadow: 0 2rpx 2rpx #e5e5e5;
+		.send_evaluate {
 			padding: 38rpx 52rpx;
-			background: #FFFFFF;
-			
+			background: #ffffff;
 		}
 	}
-	
+
 	.my_tabs {
 		// 解决这个圆角的图片，开穿透
 		:deep(.uv-tabs__wrapper__nav__line) {
diff --git a/src/pages/wrongQuestionRecord/result.vue b/src/pages/wrongQuestionRecord/result.vue
new file mode 100644
index 00000000..1fe3c1da
--- /dev/null
+++ b/src/pages/wrongQuestionRecord/result.vue
@@ -0,0 +1,11 @@
+<template>
+	<view class="max_page">
+		<image src="@/static/images/common/wc.png" class="img"></image>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pagesA.json b/src/pagesA.json
index a2d27f82..e9bacbe6 100644
--- a/src/pagesA.json
+++ b/src/pagesA.json
@@ -126,6 +126,15 @@
 				}
 			}
 		},
+		{
+			"path": "pages/wrongQuestionRecord/correct",
+			"style": {
+				"navigationBarTitleText": "错题本做题页",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
 		{
 			"path": "pages/examination/index",
 			"style": {
@@ -215,6 +224,25 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/wrongQuestionRecord/result",
+			"style": {
+				"navigationBarTitleText": "答题本答题完成结果页",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		{
+			"path": "pages/practice/result",
+			"style": {
+				"navigationBarTitleText": "练习完成结果页",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 		}
+		
 	]
 }
\ No newline at end of file
diff --git a/src/static/images/common/wc.png b/src/static/images/common/wc.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac46b7a27bd8cd1c581e641f0540fd6218dbaa3d
GIT binary patch
literal 16232
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

literal 0
HcmV?d00001