From 1a94e26b77207e44ba84bf730acb401608e78590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 22 Sep 2025 13:51:22 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix=EF=BC=9B=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  5 +++--
 src/components/file-preview/file-preview.vue |  8 ++++++--
 src/pages/index/dialog.vue                   |  3 ++-
 src/pages/index/preview.vue                  | 15 ++++++++-------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.env.development b/.env.development
index 0ca35a60..583a07ea 100644
--- a/.env.development
+++ b/.env.development
@@ -11,14 +11,15 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # app入口
 
 
-#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
+# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
 # h5专用地址x2
 
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.21:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 
+# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 
diff --git a/src/components/file-preview/file-preview.vue b/src/components/file-preview/file-preview.vue
index 021e2f00..d4db2703 100644
--- a/src/components/file-preview/file-preview.vue
+++ b/src/components/file-preview/file-preview.vue
@@ -14,12 +14,14 @@
 <script setup>
 	import {
 		ref,
+		unref,
 		onMounted,
 		computed,
 		watch
 	} from 'vue'
 	import {
-		getToken
+		getToken,
+		getUserInfo
 	} from "@/common/common.js"
 	import {
 		downloadFile
@@ -49,6 +51,8 @@
 			showView.value = false
 		}
 	})
+	const userInfo = ref(getUserInfo());
+	const userParams = '/' + (unref(userInfo)?.userName??'') + ' ' + (unref(userInfo)?.loginName??'');
 	const base_url = get_base_url('/traask/traFilePreview/')
 	const showUrl = ref('')
 	const viewerUrl = ref('/static/pdf-view/web/viewer.html')
@@ -57,7 +61,7 @@
     const token = getToken();  
     const header = {};  
 		let _id = data?.fileId || props.fileId
-		let fileUrl = base_url + '/traask/traFilePreview/' + _id
+		let fileUrl = base_url + '/traask/traFilePreview/' + _id + userParams
     if (token) 
         header['summary'] = token
 	  uni.downloadFile({
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 6e2ade92..a8586257 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -172,6 +172,7 @@
 
 	const feedbackRef = ref();
 	const userInfo = ref(getUserInfo());
+	const userParams = '/' + (unref(userInfo)?.userName??'') + ' ' + (unref(userInfo)?.loginName??'');
 	const questionList = ref([
 		// '对公小程序开户流程？',
 		// '厅堂服务经理2025年管理办法？',
@@ -479,7 +480,7 @@
 					common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				} else {
 					const base_url = get_base_url('/traask/traFilePreview/');
-					let fileUrl = base_url + '/traask/traFilePreview/' + info.docId;
+					let fileUrl = base_url + '/traask/traFilePreview/' + info.docId + userParams;
 					const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf';
 					downloadAndSaveAvatar(fileUrl, localFilePath).then((res) => {
 						uni.openDocument({
diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue
index 7b514e90..f3c8e8b2 100644
--- a/src/pages/index/preview.vue
+++ b/src/pages/index/preview.vue
@@ -17,9 +17,8 @@
 </template>
 
 <script>
-import { getToken } from '@/common/common.js'
 import common from '@/common/common'
-import {getPhoneEnvBool} from '@/common/common'
+import { getToken, getPhoneEnvBool, getUserInfo } from '@/common/common'
 import { downloadFile } from '@/api/common.js'
 import { get_base_url } from '@/api/request.js'
 var wv
@@ -31,22 +30,24 @@ export default {
       // viewerUrl: '/static/pdf-view/web/viewer.html',
       viewerUrl: '/static/view-pdf/pdf.html',
       showView: false,
-      wv: null
+      wv: null,
+			userParams: ''
     }
   },
   onLoad(params) {
     this.fileId = params.fileId || ''
+		const userInfo = getUserInfo();
+		this.userParams = '/' + (userInfo?.userName??'') + ' ' + (userInfo?.loginName??'');
   },
   onShow() {
-			console.log(getPhoneEnvBool('AND'),111)
 		if (getPhoneEnvBool('AND')) {
 			this.openPdfFn({
 				fileId: this.fileId
 			})
 		}else{
 			const base_url = get_base_url('/traask/traFilePreview/');
-			let fileUrl = base_url + '/traask/traFilePreview/' + this.fileId;
-			this.showUrl = 'https://aitstest.jlbank.com.cn:7002/traask/traFilePreview/d0c9e8cf-c862-44e7-bfa8-514a54d4baf2'//fileUrl
+			let fileUrl = base_url + '/traask/traFilePreview/' + this.fileId + this.userParams;
+			this.showUrl = fileUrl
 			console.log(this.showUrl,111)
 		}
   },
@@ -78,7 +79,7 @@ export default {
     openPdfFn(data) {
       const base_url = get_base_url('/traask/traFilePreview/')
       let _id = data?.fileId
-      let fileUrl = base_url + '/traask/traFilePreview/' + _id
+      let fileUrl = base_url + '/traask/traFilePreview/' + _id + this.userParams
       this.showUrl = this.viewerUrl + '?url=' + fileUrl
 	  console.log(this.showUrl)
       this.showView = true

From 9adeba89d5e85740d02903d8559e60e060113724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Mon, 22 Sep 2025 14:56:47 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E7=AD=94=E9=A2=98=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=99=BE=E7=A6=84=E5=BD=A2=E8=B1=A1=E4=B8=8D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                         |    4 +-
 src/components/examination/question.vue   |   12 +-
 src/components/examination/subject.vue    |    4 +-
 src/components/watermark/watermark.vue    |  137 +-
 src/composables/useUpdateAvatar.js        |   83 ++
 src/pages/course/study.vue                |  484 +++----
 src/pages/examination/index.vue           |   60 +-
 src/pages/index/dialog.vue                |   57 +-
 src/pages/me/index.vue                    |   71 +-
 src/pages/practice/index.vue              | 1456 +++++++++++----------
 src/pages/setting/index.vue               |  134 +-
 src/pages/wrongQuestionRecord/correct.vue | 1451 ++++++++++----------
 12 files changed, 1944 insertions(+), 2009 deletions(-)
 create mode 100644 src/composables/useUpdateAvatar.js

diff --git a/src/api/common.js b/src/api/common.js
index cb7c54b9..79105795 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -91,11 +91,11 @@ export const commonUploadVoiceFile = (file, url, data = {}, fileKey = 'voice') =
 				try {
 					const res = JSON.parse(result.data);
 					if (res.rtnCode === '0000') {
-						return resolve(result);
+						return resolve(res);
 					} else if (REQUES_ERROR_CODES['NO_LOGIN'].includes(res.rtnCode)) {
 						goto_login_fun()
 						return reject('NO_LOGIN');
-					}else if(res.rtnCode === '0004') {
+					} else if (res.rtnCode === '0004') {
 						return reject('N');
 					}
 					return reject('Other');
diff --git a/src/components/examination/question.vue b/src/components/examination/question.vue
index 678d4a7a..c91821bc 100644
--- a/src/components/examination/question.vue
+++ b/src/components/examination/question.vue
@@ -80,8 +80,6 @@
 <script setup>
 	import { computed, unref, ref, toRefs, watch, onMounted, nextTick } from 'vue';
 	import { onUnload } from '@dcloudio/uni-app';
-	// import { useinnerAudio, useAudioFun } from '@/store/innerAudio';
-
 	import { useAudio } from './useAudio.js';
 	import { downloadFile } from '@/api/common.js';
 	const props = defineProps({
@@ -128,7 +126,7 @@
 	});
 
 	const innerAudio = useAudio();
-
+	
 	const status = computed(() => props.status);
 	watch(
 		() => props.status,
@@ -213,22 +211,22 @@
 		watch(
 			() => props.dataInfo.voicePath,
 			(newVal) => {
-				
+				console.log('去下载oss内容333', props.dataInfo);
 				if (newVal === '' && props.dataInfo.ossKey) {
 					// 去下载oss内容
-					console.log('去下载oss内容');
 					downloadFile(props.dataInfo.ossKey).then((res) => {
 						voiceTime.value = '';
 						innerAudio.setAudioSrc(res.tempFilePath);
 					});
 				} else if (newVal === undefined) {
-					innerAudio.stopAudio();
+					
+					// innerAudio.stopAudio();
 				} else {
 					voiceTime.value = '';
 					innerAudio.setAudioSrc(newVal);
 				}
 			},
-			{ deep: true, immediate: true }
+			{ immediate: true }
 		);
 	});
 	onUnload(() => {
diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index e8b7f603..dfa8370b 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -187,7 +187,9 @@
 		(newVal) => {
 			console.log('modelValue', newVal);
 			item_answer.value = typeof newVal === 'string' ? newVal.split(',') : newVal;
-		}
+		},
+		{ deep: true }
+		
 	);
 	// watch(
 	// 	item_answer,
diff --git a/src/components/watermark/watermark.vue b/src/components/watermark/watermark.vue
index 8fab7164..7a120c92 100644
--- a/src/components/watermark/watermark.vue
+++ b/src/components/watermark/watermark.vue
@@ -7,10 +7,7 @@
 					v-for="(cols, col) in colCount"
 					:key="col"
 					:style="{
-						left: `${col * itemWidth}px`,
-						transform: `rotate(${rotate}deg)`,
-						fontSize: `${fontSize}px`,
-						color: color
+						left: `${col * itemWidth}px`
 					}"
 				>
 					{{ textValue }}
@@ -20,82 +17,69 @@
 	</KeepAlive>
 </template>
 
-<script>
+<script setup>
+	import { ref, onMounted } from 'vue';
 	import { getUserInfo } from '@/common/common';
-
-	export default {
-		name: 'Watermark',
-		props: {
-			text: {
-				type: String,
-				default: '李想 0613',
-				validator: (val) => typeof val === 'string' && val.trim() !== ''
-			},
-			// 单个水印宽度（px）
-			itemWidth: {
-				type: Number,
-				default: 180
-			},
-			// 单个水印高度（px）
-			itemHeight: {
-				type: Number,
-				default: 120
-			},
-			// 旋转角度（度）
-			rotate: {
-				type: Number,
-				default: -30
-			},
-			// 字体大小（px）
-			fontSize: {
-				type: Number,
-				default: 16
-			},
-			// 字体颜色
-			color: {
-				type: String,
-				default: 'rgba(30, 30, 70, 0.1)'
-			},
-			// 是否显示
-			showWatermark: {
-				type: Boolean,
-				default: true
-			}
+	
+	// 定义props
+	const props = defineProps({
+		// 单个水印宽度（px）
+		itemWidth: {
+			type: Number,
+			default: 180
 		},
-		data() {
-			return {
-				rowCount: 0, // 行数
-				colCount: 0, // 列数
-				windowWidth: 0, // 屏幕宽度
-				windowHeight: 0, // 屏幕高度
-				textValue: ''
-			};
+		// 单个水印高度（px）
+		itemHeight: {
+			type: Number,
+			default: 120
 		},
-		mounted() {
-			// 获取屏幕尺寸（App端兼容方式）
-			this.getWindowInfo();
-			const userInfo = getUserInfo();
-			this.textValue = (userInfo?.userName??'') + ' ' + (userInfo?.loginName??'');
-		},
-		methods: {
-			getWindowInfo() {
-				uni.getSystemInfo({
-					success: (res) => {
-						this.windowWidth = res.windowWidth;
-						this.windowHeight = res.windowHeight;
-						this.calcGridCount(); // 计算需要多少行列覆盖屏幕
-					}
-				});
-			},
-			// 计算水印网格的行列数（确保完全覆盖屏幕）
-			calcGridCount() {
-				// 列数 = 屏幕宽度 / 单个水印宽度 + 2（冗余1列避免边缘空白）
-				this.colCount = Math.ceil(this.windowWidth / this.itemWidth) + 2;
-				// 行数 = 屏幕高度 / 单个水印高度 + 2（冗余1行避免边缘空白）
-				this.rowCount = Math.ceil(this.windowHeight / this.itemHeight) + 2;
-			}
+		// 是否显示
+		showWatermark: {
+			type: Boolean,
+			default: true
 		}
+	});
+
+	// 响应式变量（替代原data）
+	const rowCount = ref(0); // 行数
+	const colCount = ref(0); // 列数
+	const windowWidth = ref(0); // 屏幕宽度
+	const windowHeight = ref(0); // 屏幕高度
+	const textValue = ref('');
+
+	// 计算水印网格的行列数（确保完全覆盖屏幕）
+	const calcGridCount = () => {
+		// 列数 = 屏幕宽度 / 单个水印宽度 + 2（冗余1列避免边缘空白）
+		colCount.value = Math.ceil(windowWidth.value / props.itemWidth) + 2;
+		// 行数 = 屏幕高度 / 单个水印高度 + 2（冗余1行避免边缘空白）
+		rowCount.value = Math.ceil(windowHeight.value / props.itemHeight) + 2;
 	};
+
+	// 获取屏幕尺寸（App端兼容方式）
+	const getWindowInfo = () => {
+		uni.getSystemInfo({
+			success: (res) => {
+				windowWidth.value = res.windowWidth;
+				windowHeight.value = res.windowHeight;
+				calcGridCount(); // 计算需要多少行列覆盖屏幕
+			}
+		});
+	};
+
+	// 组件挂载时执行（替代原mounted）
+	onMounted(() => {
+		getWindowInfo();
+		updateWatermarkText();
+	});
+	// 提取更新文字的方法
+	const updateWatermarkText = () => {
+	  const userInfo = getUserInfo();
+	  textValue.value = `${userInfo?.userName ?? ''} ${userInfo?.loginName ?? ''}`;
+	};
+	
+	defineExpose({
+		updateWatermarkText
+	});
 </script>
 
 <style scoped>
@@ -123,5 +107,8 @@
 		white-space: nowrap; /* 避免文本换行 */
 		user-select: none; /* 禁止选中 */
 		/* letter-spacing: 2px; */
+		color: rgba(30, 30, 70, 0.1);
+		font-size: 16px;
+		transform: rotate(-30deg);
 	}
 </style>
diff --git a/src/composables/useUpdateAvatar.js b/src/composables/useUpdateAvatar.js
new file mode 100644
index 00000000..d1f55e48
--- /dev/null
+++ b/src/composables/useUpdateAvatar.js
@@ -0,0 +1,83 @@
+import {
+	reactive,
+	ref,
+	computed,
+	nextTick
+} from 'vue';
+import {
+	uploadFile
+} from '@/api/common';
+import {
+	queryCurrentUser
+} from '@/api/login.js';
+import common from '@/common/common';
+import {
+	updateDfSysUserExtandInfoImageAddr
+} from '@/api/user.js';
+
+export default function useUpdateAvatar({
+	success = () => {}
+}) {
+	const avatarCropperUrl = ref('');
+	const avatarCropperStatus = ref(true);
+	// 点击修改头像
+	const click_update_avatar = () => {
+		uni.chooseImage({
+			count: 1,
+			sizeType: ['compressed'],
+			success: (resPicture) => {
+				uni.getFileInfo({
+					filePath: resPicture.tempFilePaths[0],
+					success: function(resSize) {
+						if (resSize.size > 10 * 1024 * 1024) return common.msg(
+							'图片过大，请重新选择');
+						avatarCropperUrl.value = resPicture.tempFilePaths[0];
+						avatarCropperStatus.value = true;
+					},
+					fail: function(err) {
+						common.msg('获取图片失败，请选择其他图片');
+					}
+				});
+			}
+		});
+	};
+	// 选择头像取消
+	const avatarOnCancel = (value) => {
+		avatarCropperStatus.value = false;
+	};
+	// 选择头像确定
+	const avatarOnConfirm = (file) => {
+		avatarCropperStatus.value = false;
+		nextTick(async () => {
+			common.loading('更新头像中');
+			try {
+				const data = {
+					bizScen: 'S3007',
+					thumbnailFlag: true,
+					thumbImgSize: 100
+				};
+				// 上传图片
+				const res = await uploadFile(file.tempFilePath, data);
+				// 更新个人信息
+				await updateDfSysUserExtandInfoImageAddr({
+					imageAddr: res.thumbFileId
+				});
+				// 更新个人信息
+				const userData = await queryCurrentUser();
+				common.msg('修改成功');
+				success(userData)
+
+			} catch {
+				common.msg('修改失败');
+			}
+			common.hideLoading();
+		});
+	};
+	return {
+		avatarCropperUrl,
+		avatarCropperStatus,
+		click_update_avatar,
+		avatarOnCancel,
+		avatarOnConfirm,
+	};
+}
\ No newline at end of file
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 6c5eca81..33e35d1f 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -8,32 +8,38 @@
         <!-- <image src="@/static/images/course/setting.png" alt="" class="image-icon" @click.stop="showChangeBgModelNow"></image> -->
       </view>
       <view class="body-title">
-        <uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()" />
+        <uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()"/>
         语言选择，开启学习之旅
       </view>
       <view class="voice-list">
         <uv-radio-group v-model="choiceTeacher">
-          <view class="voice-item" v-for="item in teacherList" :key="item.teacherNo" @click="choiceTeacher = item.teacherNo">
+          <view class="voice-item" v-for="item in teacherList" :key="item.teacherNo"
+                @click="choiceTeacher = item.teacherNo">
             <view class="avatar-box">
-              <ImagePreview class="img-box" :src="item.imgAddr" :isCache="true" :width="120" :height="160"> </ImagePreview>
+              <ImagePreview class="img-box" :src="item.imgAddr" :isCache="true" :width="120"
+                            :height="160"></ImagePreview>
             </view>
             <view class="right-cont">
               <view class="right-name">{{ item.teacherName }}</view>
               <view class="right-desc">描述：{{ item.voiceDesc || '--' }}</view>
               <view class="audio-box">
-                <view :class="['talking-gif', activeVoiceTeachNo === item.teacherNo && !loadingTeacherVoice ? 'is-play' : '']"> </view>
-                <CommonLoading color="#06f" v-show="activeVoiceTeachNo === item.teacherNo && loadingTeacherVoice" style="float: left" />
+                <view
+                    :class="['talking-gif', activeVoiceTeachNo === item.teacherNo && !loadingTeacherVoice ? 'is-play' : '']"></view>
+                <CommonLoading color="#06f" v-show="activeVoiceTeachNo === item.teacherNo && loadingTeacherVoice"
+                               style="float: left"/>
                 <view class="play-btn" @click="playTeacherVoice(item)">
-                  <image class="icon" v-if="activeVoiceTeachNo !== item.teacherNo" src="@/static/images/course/play-blue.png" style="width: 100%; height: 100%"></image>
-                  <image class="icon" v-else src="@/static/images/course/stop-blue.png" style="width: 100%; height: 100%"></image>
+                  <image class="icon" v-if="activeVoiceTeachNo !== item.teacherNo"
+                         src="@/static/images/course/play-blue.png" style="width: 100%; height: 100%"></image>
+                  <image class="icon" v-else src="@/static/images/course/stop-blue.png"
+                         style="width: 100%; height: 100%"></image>
                 </view>
               </view>
             </view>
-            <uv-radio :name="item.teacherNo" class="radio-box" @click.stop />
+            <uv-radio :name="item.teacherNo" class="radio-box" @click.stop/>
           </view>
         </uv-radio-group>
       </view>
-      <view class="start-btns" @click="nextStep"> 开启学习之旅 </view>
+      <view class="start-btns" @click="nextStep"> 开启学习之旅</view>
     </view>
     <view :class="['course-study-body', !IsAndEnv ? 'isIos' : 'isAnd']" v-show="step === 2">
       <view class="seek-setting">
@@ -43,46 +49,48 @@
         </view>
       </view>
       <view class="body-title" @click="scrollToBottomNow">
-        <uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()" />
+        <uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()"/>
         课程学习
       </view>
       <view class="study-num">
-        <view class="color-blue">{{ showOrder }}</view> / {{ pgrphNum }}
+        <view class="color-blue">{{ showOrder }}</view>
+        / {{ pgrphNum }}
       </view>
-      <scroll-view class="talking-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="false" :scroll-with-animation="true">
+      <scroll-view class="talking-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="false"
+                   :scroll-with-animation="true">
         <!-- <view class="talking-list-cont" id="scroll-box" ref="scrollBoxRef"> -->
         <TalkingItem
-          class="talking-item"
-          v-for="(item, index) in talkingList"
-          :key="'item' + item.id"
-          :type="item.type"
-          :dataInfo="item"
-          :activeVoiceId="activeVoiceTalkingItemId"
-          :isPlaying="activeVoiceTalkingItemId === item.id"
-          :voiceRate="chooseRate"
-          :lastQuestionInfo="lastTalkingInfo"
-          :teacherInfo="choiceTeacherInfo"
-          @changePlay="changePlayItemId"
-          @nextQuestion="nextQuestionSuccess"
-          @withdraw="withdrawNow"
-          @answerQuestion="answerQuestionNow"
-          @finishQuestion="finishQuestionNow"
-          :id="'item' + item.id"
-          :isLast="talkingList.length === index + 1"></TalkingItem>
+            class="talking-item"
+            v-for="(item, index) in talkingList"
+            :key="'item' + item.id"
+            :type="item.type"
+            :dataInfo="item"
+            :activeVoiceId="activeVoiceTalkingItemId"
+            :isPlaying="activeVoiceTalkingItemId === item.id"
+            :voiceRate="chooseRate"
+            :lastQuestionInfo="lastTalkingInfo"
+            :teacherInfo="choiceTeacherInfo"
+            @changePlay="changePlayItemId"
+            @nextQuestion="nextQuestionSuccess"
+            @withdraw="withdrawNow"
+            @answerQuestion="answerQuestionNow"
+            @finishQuestion="finishQuestionNow"
+            :id="'item' + item.id"
+            :isLast="talkingList.length === index + 1"></TalkingItem>
         <!-- <video v-if="videoUrlShow" :src="videoUrlShow" controls></video> -->
         <!-- </view> -->
       </scroll-view>
       <TouchBtn
-        class="talk-btns"
-        @uploadVoice="uploadRecordNow"
-        @submitAnswer="submitAnswerNow"
-        @startRecord="changePlayItemId('')"
-        :isLoading="isUploadingVoice"
-        :onlyVoice="answerOnlyVoice"
-        :canAnswer="testAnswer"
-        :adjustPosition="true"
-        :canAnswerText="canAnswerText"
-        :isDisabled="(lastTalkingInfo.type || 0) !== 4 || ['SN', 'MU', 'JD'].includes(lastTalkingInfo.qnsTyp)" />
+          class="talk-btns"
+          @uploadVoice="uploadRecordNow"
+          @submitAnswer="submitAnswerNow"
+          @startRecord="changePlayItemId('')"
+          :isLoading="isUploadingVoice"
+          :onlyVoice="answerOnlyVoice"
+          :canAnswer="testAnswer"
+          :adjustPosition="true"
+          :canAnswerText="canAnswerText"
+          :isDisabled="(lastTalkingInfo.type || 0) !== 4 || ['SN', 'MU', 'JD'].includes(lastTalkingInfo.qnsTyp)"/>
     </view>
     <uv-overlay :show="showSeekModel" opacity=".6" @click="showSeekModel = false">
       <view class="overlay-box">
@@ -99,17 +107,19 @@
     <uv-overlay :show="showBgModel" opacity=".6" @click="showBgModel = false">
       <view class="overlay-box">
         <view class="white-bg-box-setting white-bg-box">
-          <view class="box-title">设置 </view>
+          <view class="box-title">设置</view>
           <view class="box-items" @click.stop>
             <view class="box-item">
               <view class="box-item-title">音色</view>
               <uv-radio-group v-model="choiceTeacher" class="box-item-cont">
-                <view class="overlay-voice-item" v-for="item in teacherList" :key="item.teacherNo" @click="changeTeacherVoiceNow(item)">
+                <view class="overlay-voice-item" v-for="item in teacherList" :key="item.teacherNo"
+                      @click="changeTeacherVoiceNow(item)">
                   <view class="overlay-avatar-box">
-                    <ImagePreview class="overlay-img-box" :src="item.imgAddr" :isCache="true" :width="120" :height="160"></ImagePreview>
+                    <ImagePreview class="overlay-img-box" :src="item.imgAddr" :isCache="true" :width="120"
+                                  :height="160"></ImagePreview>
                   </view>
                   <view class="overlay-teacher-name">{{ item.teacherName }}</view>
-                  <uv-radio :name="item.teacherNo" class="overlay-radio-box" @click.stop />
+                  <uv-radio :name="item.teacherNo" class="overlay-radio-box" @click.stop/>
                 </view>
               </uv-radio-group>
             </view>
@@ -121,37 +131,37 @@
 </template>
 
 <script setup>
-import { reactive, ref, computed, unref, onMounted, onUnmounted, getCurrentInstance, nextTick } from 'vue'
-import { onLoad, onShow, onUnload, onHide } from '@dcloudio/uni-app'
-import { previewFile, downloadFile, commonUploadVoiceFile, downloadVoiceFile, uploadVoiceFile } from '@/api/common.js'
-import { getToken, getPhoneEnvBool } from '@/common/common.js'
-import { get_base_url, goto_login_fun } from '@/api/request'
-import { 
-	getCourseStudyInfoApi, 
-	afreshStudyCourseApi, 
-	queryQuestionEvalateApi, 
-	textChartApi, 
-	setStudyTeacherApi, 
-	textChartPreviewApi, 
-	previewAfreshStudyCourse,
-	studyEndApi,
-	studyStartApi
+import {reactive, ref, computed, unref, onMounted, onUnmounted, getCurrentInstance, nextTick} from 'vue'
+import {onLoad, onShow, onUnload, onHide} from '@dcloudio/uni-app'
+import {previewFile, downloadFile, commonUploadVoiceFile, downloadVoiceFile, uploadVoiceFile} from '@/api/common.js'
+import {getToken, getPhoneEnvBool} from '@/common/common.js'
+import {get_base_url, goto_login_fun} from '@/api/request'
+import {
+  getCourseStudyInfoApi,
+  afreshStudyCourseApi,
+  queryQuestionEvalateApi,
+  textChartApi,
+  setStudyTeacherApi,
+  textChartPreviewApi,
+  previewAfreshStudyCourse,
+  studyEndApi,
+  studyStartApi
 } from '@/api/study.js'
 import common from '@/common/common'
 import TalkingItem from '@/pages/course/components/talkingItem.vue'
 import ImagePreview from '@/components/image-preview/image-preview.vue'
 import TouchBtn from '@/pages/course/components/touchBtn.vue'
 
-import { useSocketStore } from '@/store/socket.js'
-import { useStorageStore } from '@/store/storage.js'
-import { storeToRefs } from 'pinia'
+import {useSocketStore} from '@/store/socket.js'
+import {useStorageStore} from '@/store/storage.js'
+import {storeToRefs} from 'pinia'
 
 const socketStore = useSocketStore()
 const storageStore = useStorageStore()
-const { SocketObj } = storeToRefs(socketStore)
+const {SocketObj} = storeToRefs(socketStore)
 const audioCacheObj = computed(() => storageStore.audioObj)
 
-const { proxy } = getCurrentInstance()
+const {proxy} = getCurrentInstance()
 const crsNum = ref('')
 const crsId = ref('')
 const step = ref(0)
@@ -169,7 +179,7 @@ const IsAndEnv = ref(getPhoneEnvBool('AND'))
 
 const ajaxApi = computed(() => (isPreview.value ? textChartPreviewApi : textChartApi))
 
-const { statusBarHeight } = uni.getWindowInfo()
+const {statusBarHeight} = uni.getWindowInfo()
 
 const pageTopPadding = computed(() => statusBarHeight + 'px')
 
@@ -178,7 +188,7 @@ const isContinue = ref('N')
 const getData = async flag => {
   isContinue.value = 'N'
   try {
-    const { body } = await getCourseStudyInfoApi({
+    const {body} = await getCourseStudyInfoApi({
       crsId: crsId.value
     })
     teacherList.value = body.teacheList.map(t => ({
@@ -211,29 +221,30 @@ const getData = async flag => {
           return
         }
         common
-          .show('提示', '系统检测到您已存在学习记录，要继续学习吗？', true, '重新学习', '继续学习')
-          .then(res => {
-            if (res) {
-              // 继续学习 ， 获取学习历史接口
-              // 滚动到最下面
-              scrollToBottomNow()
-              isContinue.value = 'Y'
-              sendMessage({
-                commond: 'STDY',
-                body: {
-                  crsId: crsId.value,
-                  teacherNo: choiceTeacher.value,
-                  studyType: isPreview.value ? 'P' : 'S',
-                  isContinue: isContinue.value
-                }
-              })
-              step.value = 2
-            } else {
-              // 重新学习
-              resStartStudyNow(body.teacheList)
-            }
-          })
-          .finally(() => {})
+            .show('提示', '系统检测到您已存在学习记录，要继续学习吗？', true, '重新学习', '继续学习')
+            .then(res => {
+              if (res) {
+                // 继续学习 ， 获取学习历史接口
+                // 滚动到最下面
+                scrollToBottomNow()
+                isContinue.value = 'Y'
+                sendMessage({
+                  commond: 'STDY',
+                  body: {
+                    crsId: crsId.value,
+                    teacherNo: choiceTeacher.value,
+                    studyType: isPreview.value ? 'P' : 'S',
+                    isContinue: isContinue.value
+                  }
+                })
+                step.value = 2
+              } else {
+                // 重新学习
+                resStartStudyNow(body.teacheList)
+              }
+            })
+            .finally(() => {
+            })
       }
     }
   } catch {
@@ -242,15 +253,16 @@ const getData = async flag => {
   }
 }
 const startStudy = (data) => {
-	studyStartApi(data).then(res=>{
-		const { body } = res
-		stdyId.value = body.stdyId || ''
-		stdyBatch.value = body.stdyBatch || ''
-		oldStdyId.value = body.oldStdyId || ''
-		logId.value = body.logId || ''
-		getGraphInfoUnStudy(1)
-		step.value = 2
-	}).catch(err=>{})
+  studyStartApi(data).then(res => {
+    const {body} = res
+    stdyId.value = body.stdyId || ''
+    stdyBatch.value = body.stdyBatch || ''
+    oldStdyId.value = body.oldStdyId || ''
+    logId.value = body.logId || ''
+    getGraphInfoUnStudy(1)
+    step.value = 2
+  }).catch(err => {
+  })
 }
 // 重新学习
 const resStartStudyNow = ($list = []) => {
@@ -259,22 +271,22 @@ const resStartStudyNow = ($list = []) => {
   _ajax({
     crsId: crsId.value
   })
-    .then(res => {
-      step.value = 1
-      teacherList.value = $list.map(t => ({
-        ...t,
-        voicePath: '',
-        voiceObj: null
-      }))
-    })
-    .catch(e => {
-      step.value = 1
-      teacherList.value = $list.map(t => ({
-        ...t,
-        voicePath: '',
-        voiceObj: null
-      }))
-    })
+      .then(res => {
+        step.value = 1
+        teacherList.value = $list.map(t => ({
+          ...t,
+          voicePath: '',
+          voiceObj: null
+        }))
+      })
+      .catch(e => {
+        step.value = 1
+        teacherList.value = $list.map(t => ({
+          ...t,
+          voicePath: '',
+          voiceObj: null
+        }))
+      })
 }
 
 const showChangeSeekModelNow = () => {
@@ -419,26 +431,28 @@ const getGraphInfoUnStudy = (flag = 0) => {
       uni.$emit('refresh_course_list', crsId.value)
       if (isPreview.value) {
         common
-          .show('提示', '您已学完全部知识点', false)
-          .then(res => {
-            common.navigateBack()
-            // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`)
-          })
-          .finally(() => {})
+            .show('提示', '您已学完全部知识点', false)
+            .then(res => {
+              common.navigateBack()
+              // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`)
+            })
+            .finally(() => {
+            })
       } else {
         common
-          .show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗？', true, '取消', '去评论')
-          .then(res => {
-            if (res) {
-              // 去评论
-              common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`)
-            } else {
-              // 取消
-              common.navigateBack()
-              // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
-            }
-          })
-          .finally(() => {})
+            .show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗？', true, '取消', '去评论')
+            .then(res => {
+              if (res) {
+                // 去评论
+                common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`)
+              } else {
+                // 取消
+                common.navigateBack()
+                // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+              }
+            })
+            .finally(() => {
+            })
       }
 
       return
@@ -680,7 +694,7 @@ const logId = ref('')
 const initsocketTask = () => {
   socketStore.creatSocket()
   unref(SocketObj).on('message', res => {
-    const { rtnCode, body, commond } = JSON.parse(res.data)
+    const {rtnCode, body, commond} = JSON.parse(res.data)
     if (rtnCode === '0000') {
       if (commond === 'STDYBTH' && !stdyId.value) {
         stdyId.value = body.stdyId || ''
@@ -702,7 +716,7 @@ const reconnect = () => {
 }
 const sendMessage = data => {
   // unref(SocketObj).send(data)
-	startStudy(data.body)
+  startStudy(data.body)
 }
 // ws 结束
 const startPgrphId = ref('')
@@ -744,15 +758,15 @@ const changeAppHeightBottom = height => {
   // #endif
 }
 const closeStudy = () => {
-	return studyEndApi({
-		stdyId: stdyId.value
-	})
+  return studyEndApi({
+    stdyId: stdyId.value
+  })
 }
 onHide(() => {
   changePlayItemId('')
-	if(isPreview.value === 'S'){
-		closeStudy()
-	}
+  if (isPreview.value === 'S') {
+    closeStudy()
+  }
   // socketStore.closeSocket()
   //#ifdef APP-PLUS
   uni.offKeyboardHeightChange(setHeight)
@@ -769,29 +783,30 @@ onShow(() => {
   if (watchFlag.value === 1) return
   // getData('2');
   // initsocketTask()
-	if(isPreview.value === 'S'){
-		studyStartApi({
-			crsId: crsId.value,
-			teacherNo: choiceTeacher.value,
-			studyType: isPreview.value ? 'P' : 'S',
-			isContinue: isContinue.value,
-			stdyId: stdyId.value
-		}).then(res=>{
-			const { body } = res
-			stdyId.value = body.stdyId || ''
-			stdyBatch.value = body.stdyBatch || ''
-			oldStdyId.value = body.oldStdyId || ''
-			logId.value = body.logId || ''
-			step.value = 2
-		}).catch(err=>{})
-	}
+  if (isPreview.value === 'S') {
+    studyStartApi({
+      crsId: crsId.value,
+      teacherNo: choiceTeacher.value,
+      studyType: isPreview.value ? 'P' : 'S',
+      isContinue: isContinue.value,
+      stdyId: stdyId.value
+    }).then(res => {
+      const {body} = res
+      stdyId.value = body.stdyId || ''
+      stdyBatch.value = body.stdyBatch || ''
+      oldStdyId.value = body.oldStdyId || ''
+      logId.value = body.logId || ''
+      step.value = 2
+    }).catch(err => {
+    })
+  }
 })
 const watchFlag = ref(1)
 onUnload(() => {
   console.log('onUnload')
-	if(isPreview.value === 'S'){
-		closeStudy()
-	}
+  if (isPreview.value === 'S') {
+    closeStudy()
+  }
   // socketStore.closeSocket()
   changePlayItemId('')
   console.log(typeof teacherVoiceObj)
@@ -799,7 +814,8 @@ onUnload(() => {
     teacherVoiceObj?.stop()
     teacherVoiceObj.src = ''
     // 0910杨航叫我这么改的
-  } catch {}
+  } catch {
+  }
 })
 const testAnswer = computed(() => {
   if (talkingList.value.length < 5) return true
@@ -862,10 +878,7 @@ const uploadRecordNow = voicePath => {
     processType: 'ANSER-VOICE',
     requestBody: JSON.stringify(_data)
   })
-    .then(res => {
-      let _res = JSON.parse(res.data)
-      console.log(_res)
-      if (_res.rtnCode === '0000') {
+      .then(_res => {
         talkingList.value = talkingList.value.map(t => {
           if (t.id === _id) {
             return {
@@ -890,20 +903,19 @@ const uploadRecordNow = voicePath => {
         })
         console.log(11111, _res.body.chatBody)
         scrollToBottomNow()
-      } else {
-      }
-      setIsUploadingVoice()
-    })
-    .catch(err => {
-      console.log('err', err)
-      setIsUploadingVoice()
-      talkingList.value = talkingList.value.filter(t => t.id !== _id)
-      uni.showToast({
-        title: err.message || '系统异常，请联系管理员',
-        icon: 'none',
-        duration: 1000
+
+        setIsUploadingVoice()
+      })
+      .catch(err => {
+        console.log('err', err)
+        setIsUploadingVoice()
+        talkingList.value = talkingList.value.filter(t => t.id !== _id)
+        uni.showToast({
+          title: err.message || '系统异常，请联系管理员',
+          icon: 'none',
+          duration: 1000
+        })
       })
-    })
   // #endif
 }
 const setIsUploadingVoice = (flag = false) => {
@@ -936,33 +948,33 @@ const submitAnswerNow = (val, cb) => {
     processType: 'ANSER-TEXT',
     requestBody: JSON.stringify(_data)
   })
-    .then(res => {
-      setIsUploadingVoice()
-      let _id = new Date().getTime() + 'id'
-      let _body = res.body || {}
-      if (!_body.chatBody) {
-        return
-      }
-      talkingList.value.push({
-        ..._data,
-        chatContent: _body.chatContent,
-        recordId: _body.chatBody.recordId,
-        stdyPgrphId: _body.chatBody.stdyPgrphId,
-        talkingContent: val,
-        talkingVoice: '',
-        type: 2,
-        userInfo: {
-          ...choiceTeacherInfo.value
-        },
-        qstLogId: qstLogId.value,
-        id: _id
+      .then(res => {
+        setIsUploadingVoice()
+        let _id = new Date().getTime() + 'id'
+        let _body = res.body || {}
+        if (!_body.chatBody) {
+          return
+        }
+        talkingList.value.push({
+          ..._data,
+          chatContent: _body.chatContent,
+          recordId: _body.chatBody.recordId,
+          stdyPgrphId: _body.chatBody.stdyPgrphId,
+          talkingContent: val,
+          talkingVoice: '',
+          type: 2,
+          userInfo: {
+            ...choiceTeacherInfo.value
+          },
+          qstLogId: qstLogId.value,
+          id: _id
+        })
+        scrollToBottomNow()
+        cb && cb()
+      })
+      .catch(() => {
+        setIsUploadingVoice()
       })
-      scrollToBottomNow()
-      cb && cb()
-    })
-    .catch(() => {
-      setIsUploadingVoice()
-    })
 }
 // 撤回
 const withdrawNow = data => {
@@ -1038,40 +1050,40 @@ const finishQuestionNow = data => {
       asrStartTm: data.asrStartTm
     })
   })
-    .then(res => {
-      // common.msg('完成成功，开始获取评分维度数据！')
-      let _state = res.body.chatBody.isWait
-      if (_state !== 'Y') {
-        common.msg('提交答案失败！')
-        return
-      }
-      let _id1 = new Date().getTime() + '3d'
-      talkingList.value.push({
-        id: _id1,
-        talkingContent: '完成',
-        userInfo: {
-          ...choiceTeacherInfo.value
-        },
-        type: 0
+      .then(res => {
+        // common.msg('完成成功，开始获取评分维度数据！')
+        let _state = res.body.chatBody.isWait
+        if (_state !== 'Y') {
+          common.msg('提交答案失败！')
+          return
+        }
+        let _id1 = new Date().getTime() + '3d'
+        talkingList.value.push({
+          id: _id1,
+          talkingContent: '完成',
+          userInfo: {
+            ...choiceTeacherInfo.value
+          },
+          type: 0
+        })
+        loadingExecLogId.value = res.body.chatBody.execLogId
+        qstLogId.value = loadingExecLogId.value
+        let _id = new Date().getTime() + 'id'
+        lastTalkingInfo.value = {
+          isLoading: true,
+          id: _id,
+          userInfo: {
+            ...choiceTeacherInfo.value
+          },
+          type: 5
+        }
+        talkingList.value.push(JSON.parse(JSON.stringify(lastTalkingInfo.value)))
+        scrollToBottomNow(0)
+        getQuestionEvalateRequest(_id, data, 1)
+      })
+      .catch(err => {
+        console.log(err)
       })
-      loadingExecLogId.value = res.body.chatBody.execLogId
-      qstLogId.value = loadingExecLogId.value
-      let _id = new Date().getTime() + 'id'
-      lastTalkingInfo.value = {
-        isLoading: true,
-        id: _id,
-        userInfo: {
-          ...choiceTeacherInfo.value
-        },
-        type: 5
-      }
-      talkingList.value.push(JSON.parse(JSON.stringify(lastTalkingInfo.value)))
-      scrollToBottomNow(0)
-      getQuestionEvalateRequest(_id, data, 1)
-    })
-    .catch(err => {
-      console.log(err)
-    })
 }
 // 查询问题回答评分
 const getQuestionEvalateRequest = (id, data, num) => {
@@ -1198,9 +1210,11 @@ const chooseRateNow = item => {
     display: flex;
     flex-direction: column;
     padding-top: v-bind(pageTopPadding);
+
     &.isAnd {
       height: calc(100% - v-bind(totalBotHeight));
     }
+
     .body-title {
       height: 90rpx;
       text-align: center;
diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue
index 4a1afd8d..e4ee7859 100644
--- a/src/pages/examination/index.vue
+++ b/src/pages/examination/index.vue
@@ -162,6 +162,7 @@
 	import { commonUploadVoiceFile } from '@/api/common.js';
 	import { optionErrorIcon, examinationSheetIcon, practiceExitIcon } from '@/common/imgSvg';
 	import { commitPaperExam, commitCrsExam, commitPaperCache } from '@/api/examination.js';
+
 	const answerIsOver = ref(true);
 	const feedbackRef = ref(null);
 	const dialogRef = ref(null);
@@ -307,24 +308,20 @@
 			topic.es_status = '00'; // 00转圈
 			const voicePath = submitObj;
 			commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
-				.then((res) => {
-					let _res = JSON.parse(res.data);
-					console.log('voicePath_res_res_res', _res);
-					if (_res.rtnCode === '0000') {
-						const _content = _res.body.transContent.trim();
-						if (_content === '') {
-							topic.es_status = ''; // 取消转圈
-							return common.msg('未识别到文字');
-						} else {
-							topic.es_status = '02';
-							topic.my_answer = {
-								anserResult: _res.body.transContent,
-								ossKey: _res.body.fileId,
-								ossAddr: _res.body.ossFileAddr,
-								voicePath: voicePath
-							};
-							hand_in_paper_cache();
-						}
+				.then((_res) => {
+					const _content = _res.body.transContent.trim();
+					if (_content === '') {
+						topic.es_status = ''; // 取消转圈
+						return common.msg('未识别到文字');
+					} else {
+						topic.es_status = '02';
+						topic.my_answer = {
+							anserResult: _res.body.transContent,
+							ossKey: _res.body.fileId,
+							ossAddr: _res.body.ossFileAddr,
+							voicePath: voicePath
+						};
+						hand_in_paper_cache();
 					}
 				})
 				.catch((error) => {
@@ -344,7 +341,6 @@
 
 	const answerCacheList = ref({});
 	const setAnswerCacheList = (value) => {
-		console.log('触发变化', value);
 		answerCacheList.value = value;
 		common.setValue(examinationAnswerCacheKey, value);
 	};
@@ -390,9 +386,10 @@
 		paperData.flagQueryDetail = examination.flagQueryDetail || 'Y';
 		mode = paperData.examId ? 'PAPERS' : 'CRS'; // 课程考试CRS，考试中心考试PAPERS
 		// 设置缓存的键的名称
-		const suffix = mode === 'PAPERS' ? paperData.examId : paperData.crsId;
-		examinationAnswerCacheKey = 'examinationAnswerCache' + suffix;
+		
+		examinationAnswerCacheKey = 'examinationAnswerCache' + paperData.execId;
 		answerCacheList.value = common.getValue(examinationAnswerCacheKey);
+		console.log('assaasas', answerCacheList.value);
 		if (typeof answerCacheList.value !== 'object') {
 			answerCacheList.value = {};
 			paperData.isCacheExam = 'N';
@@ -437,18 +434,18 @@
 							return [];
 						}
 						// 校验缓存列表是否存在且为对象类型
-						if (!answerCacheList?.value || typeof answerCacheList.value !== 'object') {
-							return [];
-						}
+						// if (!answerCacheList.value || typeof answerCacheList.value !== 'object') {
+						// 	return [];
+						// }
 						// 校验问题ID是否有效
-						if (!res || typeof res.qnsId === 'undefined') {
-							return [];
-						}
+						// if (!res || typeof res.qnsId === 'undefined') {
+						// 	return [];
+						// }
 						// 检查缓存中是否存在该问题的答案
 						if (res.qnsId in answerCacheList.value) {
 							const cachedAnswer = answerCacheList.value[res.qnsId];
 							// 确保返回值是数组类型（根据原逻辑推测应该返回数组）
-							return Array.isArray(cachedAnswer) ? cachedAnswer : [];
+							return cachedAnswer;
 						}
 						// 缓存中不存在时返回空数组
 						return [];
@@ -611,7 +608,6 @@
 	const hand_in_paper_cache = () => {
 		// 获取当前题目
 		addTopicAnswerCache();
-
 		const answerDtoList = getAnswerDtoList();
 		console.log('answerDtoList', answerDtoList);
 		commitPaperCache({
@@ -724,11 +720,13 @@
 					height: 30rpx;
 				}
 			}
+
 			.sheet_table_scroll {
 				max-height: calc(80vh - 180rpx);
 				// background-color: red;
 				width: calc(100vw - 108rpx);
 			}
+
 			.sheet_table {
 				width: 100%;
 
@@ -910,12 +908,15 @@
 			align-items: center;
 			width: 242rpx;
 			flex-wrap: nowrap;
+
 			.grey {
 				margin-right: 8rpx;
 			}
+
 			.countdown_time {
 				white-space: nowrap;
 			}
+
 			:deep(.uv-count-down__text) {
 				color: #ffffff !important;
 				font-weight: 600;
@@ -959,6 +960,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: flex-end;
+
 			.img {
 				width: 32rpx;
 				height: 32rpx;
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 6e2ade92..fb9089a8 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -1,7 +1,5 @@
 <template>
-	
 	<view class="index-dialog-page">
-		<watermark></watermark>
 		<!-- <MarkdownPreview/> -->
 		<view class="top-bg"></view>
 		<view class="bot-bg"></view>
@@ -134,9 +132,12 @@
 			<PreviewVue ref="previewRef" />
 		</scroll-view>
 	</view>
+
 	<!-- 反馈组件 -->
 	<Feedback ref="feedbackRef" @feedbackAnswer="feedbackAnswer"></Feedback>
 	<!-- <file-preview ref="previewFileRef" :file-id="'603058d8-88e0-43d2-8242-3132b85bc91c'" v-model="showPreview" /> -->
+	<!-- 水印组件 -->
+	<watermark ref="watermarkRef"></watermark>
 </template>
 
 <script setup>
@@ -171,6 +172,7 @@
 	const { SocketObj } = storeToRefs(socketStore);
 
 	const feedbackRef = ref();
+	const watermarkRef = ref();
 	const userInfo = ref(getUserInfo());
 	const questionList = ref([
 		// '对公小程序开户流程？',
@@ -660,32 +662,28 @@
 		});
 		scrollToBottomNow();
 		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
-			.then((res) => {
-				let _res = JSON.parse(res.data);
-				if (_res.rtnCode === '0000') {
-					if (!!(_res.body.transContent || '').trim()) {
-						askData.value = {
-							reqBatch: reqBatch.value,
-							intrctWay: '02', //01-文本；02-语音；03-图片
-							intrctContent: _res.body.transContent,
-							bucketKey: _res.body.fileId,
-							ossFileAddr: _res.body.ossFileAddr,
-							talkingVoice: voicePath
-						};
-						sendMessage({
-							commond: 'ASK',
-							body: askData.value
-						});
-					} else {
-						talkingList.value.pop();
-						uni.showToast({
-							title: '未识别到文字',
-							icon: 'none',
-							duration: 1000
-						});
-					}
-				} else {
-				}
+			.then((_res) => {
+        if (!!(_res.body.transContent || '').trim()) {
+          askData.value = {
+            reqBatch: reqBatch.value,
+            intrctWay: '02', //01-文本；02-语音；03-图片
+            intrctContent: _res.body.transContent,
+            bucketKey: _res.body.fileId,
+            ossFileAddr: _res.body.ossFileAddr,
+            talkingVoice: voicePath
+          };
+          sendMessage({
+            commond: 'ASK',
+            body: askData.value
+          });
+        } else {
+          talkingList.value.pop();
+          uni.showToast({
+            title: '未识别到文字',
+            icon: 'none',
+            duration: 1000
+          });
+        }
 			})
 			.catch((err) => {
 				talkingList.value.pop();
@@ -842,6 +840,9 @@
 	});
 	onShow(() => {
 		uni.onKeyboardHeightChange(setHeight);
+		nextTick(() => {
+			watermarkRef.value?.updateWatermarkText();
+		});
 	});
 	// #endif
 	onUnload(() => {
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 031da385..92a5f0ba 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -137,8 +137,8 @@
 			:width="500"
 			:height="500"
 			:delay="150"
-			@cancel="onCancel"
-			@confirm="onConfirm"
+			@cancel="avatarOnCancel"
+			@confirm="avatarOnConfirm"
 		></avatar-cropper>
 	</view>
 </template>
@@ -157,6 +157,13 @@
 	import { setMascot } from '@/common/mascot.js';
 	import { queryCurrentUser } from '@/api/login.js';
 	import { defaultAvatar } from '@/enum.js';
+	import useUpdateAvatar from '@/composables/useUpdateAvatar';
+	const { avatarCropperUrl, click_update_avatar, avatarCropperStatus, avatarOnCancel, avatarOnConfirm } = useUpdateAvatar({
+		success: (userData) => {
+			user_info.imageAddr = userData.imageAddr;
+			user_info.imagePath = '';
+		}
+	});
 	const badgeList = [
 		{
 			name: '黑铁',
@@ -209,7 +216,6 @@
 
 	const click_loginout = () => {
 		common.show('确定退出登录？').then(async (res) => {
-			console.log(res);
 			if (!res) return;
 			try {
 				common.loading('正在退出登录');
@@ -221,7 +227,6 @@
 			common.reLaunch('/pages/login/login');
 		});
 	};
-	onLoad(() => {});
 	onShow(() => {
 		setMascot();
 		Object.assign(user_info, getUserInfo());
@@ -229,64 +234,6 @@
 	onPullDownRefresh(() => {
 		uni.stopPullDownRefresh();
 	});
-
-	// 头像
-	const avatarCropperStatus = ref(true);
-	const avatarCropperUrl = ref('');
-	// 点击修改头像
-	const click_update_avatar = () => {
-		uni.chooseImage({
-			count: 1,
-			sizeType: ['compressed'],
-			success: (resPicture) => {
-				uni.getFileInfo({
-					filePath: resPicture.tempFilePaths[0],
-					success: function (resSize) {
-						if (resSize.size > 10 * 1024 * 1024) return common.msg('图片过大，请重新选择');
-						avatarCropperUrl.value = resPicture.tempFilePaths[0];
-						avatarCropperStatus.value = true;
-					},
-					fail: function (err) {
-						common.msg('获取图片失败，请选择其他图片');
-					}
-				});
-			}
-		});
-	};
-	// 选择头像取消
-	const onCancel = (value) => {
-		avatarCropperStatus.value = false;
-	};
-	// 选择头像确定
-	const onConfirm = (file) => {
-		avatarCropperStatus.value = false;
-		nextTick(async () => {
-			common.loading('更新头像中');
-			try {
-				const data = {
-					bizScen: 'S3007',
-					thumbnailFlag: true,
-					thumbImgSize: 100
-				};
-				// 上传图片
-				const res = await uploadFile(file.tempFilePath, data);
-				// 更新个人信息
-				await updateDfSysUserExtandInfoImageAddr({
-					imageAddr: res.thumbFileId
-				});
-				// 更新个人信息
-				const userData = await queryCurrentUser();
-				console.log('userData', userData);
-				common.msg('修改成功');
-				user_info.imageAddr = userData.imageAddr;
-				user_info.imagePath = '';
-			} catch (e) {
-				console.log('sss', e);
-				common.msg('修改失败');
-			}
-			common.hideLoading();
-		});
-	};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index d659c1f4..5363ac0c 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -1,783 +1,787 @@
 <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 mr-10">当前题目/总题数</text>
-					<text class="bold">{{ questionNumber + 1 }}</text>
-					<text class="grey">/{{ storageTopicList.length }}</text>
-				</view>
-				<view class="question">
-					<view class="grey">练习时长</view>
-					<view class="countdown_time">
-						{{ formatSeconds(practiceTime) }}
-					</view>
-				</view>
-			</view>
+  <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 mr-10">当前题目/总题数</text>
+          <text class="bold">{{ questionNumber + 1 }}</text>
+          <text class="grey">/{{ storageTopicList.length }}</text>
+        </view>
+        <view class="question">
+          <view class="grey">练习时长</view>
+          <view class="countdown_time">
+            {{ formatSeconds(practiceTime) }}
+          </view>
+        </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>
+      <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, onBackPress, onReady } from '@dcloudio/uni-app';
+import {ref, reactive, computed, onMounted, nextTick, onUnmounted} from 'vue';
+import {onLoad, onHide, onShow, onUnload, onBackPress, onReady} 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, formatSeconds, 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 { startExamByCrs } from '@/api/examination.js';
-	import { startPracticeByCrs } from '@/api/practice.js';
-	const feedbackRef = ref(null);
-	const dialogRef = ref(null);
-	const touchBtnRef = ref(null);
-	const practiceTime = ref(0); // 当前练习时间
-	let practiceStartTime = 0; // 练习开始时间
-	let practiceTimeTimer = null; // 练习计时器
-	let leaveDuration = 0; // 当前总计离开时间
-	let leaveStartTime = 0; // 离开开始时间
-	const mode = ref('practice'); // 考试 examination 练习practice
-	const paperData = reactive({
-		exrId: '',
-		crsId: '',
-		name: '' // 名称
-	}); // 试卷信息
-	const topicList = reactive([]); // 问题列表
-	const storageTopicList = ref([]); // 所有题列表
-	const popup_input_bottom = ref('0px');
-	const questionNumber = ref(0); // 题号
-	const systemInfo = uni.getSystemInfoSync();
+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, formatSeconds, 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 {startExamByCrs} from '@/api/examination.js';
+import {startPracticeByCrs} from '@/api/practice.js';
 
-	const topic = computed({
-		get: () => topicList[questionNumber.value],
-		set: (val) => (topicList[questionNumber.value] = val)
-	});
+const feedbackRef = ref(null);
+const dialogRef = ref(null);
+const touchBtnRef = ref(null);
+const practiceTime = ref(0); // 当前练习时间
+let practiceStartTime = 0; // 练习开始时间
+let practiceTimeTimer = null; // 练习计时器
+let leaveDuration = 0; // 当前总计离开时间
+let leaveStartTime = 0; // 离开开始时间
+const mode = ref('practice'); // 考试 examination 练习practice
+const paperData = reactive({
+  exrId: '',
+  crsId: '',
+  name: '' // 名称
+}); // 试卷信息
+const topicList = reactive([]); // 问题列表
+const storageTopicList = ref([]); // 所有题列表
+const popup_input_bottom = ref('0px');
+const questionNumber = ref(0); // 题号
+const systemInfo = uni.getSystemInfoSync();
 
-	const showTouchBtn = computed(() => {
-		return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
-	});
+const topic = computed({
+  get: () => topicList[questionNumber.value],
+  set: (val) => (topicList[questionNumber.value] = val)
+});
 
-	// 下面语音组件的禁用状态判断
-	const touchIsDisabled = computed(() => {
-		return topic.value?.es_status !== '' && topic.value?.es_status !== undefined;
-	});
+const showTouchBtn = computed(() => {
+  return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
+});
 
-	const progress = computed(() => {
-		// 计算进度百分比（保留两位小数）
-		const total = storageTopicList.value.length;
-		if (total === 0) return 0;
-		const completed = questionNumber.value + 1;
-		return Math.min(Math.round((completed / total) * 10000) / 100, 100);
-	});
+// 下面语音组件的禁用状态判断
+const touchIsDisabled = computed(() => {
+  return topic.value?.es_status !== '' && topic.value?.es_status !== undefined;
+});
 
-	// 滑动切换
-	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 > 90 && dx < 250 && isLastTopic.value && ['P', 'U'].includes(topic.value.judgeResult)) {
-			// 如果是最后一题并且右滑动大于50,并且这题已经答了，就触发练习完成
-			isTriggered.value = true;
-			hand_in_paper_button_click();
-		}
-	};
+const progress = computed(() => {
+  // 计算进度百分比（保留两位小数）
+  const total = storageTopicList.value.length;
+  if (total === 0) return 0;
+  const completed = questionNumber.value + 1;
+  return Math.min(Math.round((completed / total) * 10000) / 100, 100);
+});
 
-	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 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 > 90 && dx < 250 && isLastTopic.value && ['P', 'U'].includes(topic.value.judgeResult)) {
+    // 如果是最后一题并且右滑动大于50,并且这题已经答了，就触发练习完成
+    isTriggered.value = true;
+    hand_in_paper_button_click();
+  }
+};
 
-	// 单题回答
-	const submitProblem = (answer) => {
-		console.log('答题内容', answer);
-		console.log('答单题', topic);
+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 = ''; // 取消转圈
+  }
+};
 
-		common.loading('答题中');
-		practiceAnswer({
-			exrId: paperData.exrId,
-			ossKey: '',
-			qnsId: topic.value.qnsId,
-			showOrder: questionNumber.value + 1,
-			examLenTm: practiceTime.value, // 练习时长
-			...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.traQnsInfoVo;
-				}
-				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为错误
-				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' // 问答题答对打答错都不切换
-					) {
-						nextTick(() => {
-							setTimeout(() => {
-								questionNumber.value++;
-							}, 200);
-						});
-					} else {
-						console.log('为什么不跳转2', judgeResultStatus);
-						console.log('为什么不跳转3', topic.value.qnsTyp !== 'ES');
-					}
-				}
-			})
-			.catch(() => {
-				// 单选和判断需要清除已点击的按钮
-				if (['JD', 'SN'].includes(topic.value.qnsTyp)) {
-					topic.value.my_answer = [];
-				}
-				common.hideLoading();
-			});
-	};
+// 单题回答
+const submitProblem = (answer) => {
+  console.log('答题内容', answer);
+  console.log('答单题', topic);
 
-	// 问答题轮询结果方法
-	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);
-			});
-	};
+  common.loading('答题中');
+  practiceAnswer({
+    exrId: paperData.exrId,
+    ossKey: '',
+    qnsId: topic.value.qnsId,
+    showOrder: questionNumber.value + 1,
+    examLenTm: practiceTime.value, // 练习时长
+    ...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.traQnsInfoVo;
+        }
+        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为错误
+        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' // 问答题答对打答错都不切换
+          ) {
+            nextTick(() => {
+              setTimeout(() => {
+                questionNumber.value++;
+              }, 200);
+            });
+          } else {
+            console.log('为什么不跳转2', judgeResultStatus);
+            console.log('为什么不跳转3', topic.value.qnsTyp !== 'ES');
+          }
+        }
+      })
+      .catch(() => {
+        // 单选和判断需要清除已点击的按钮
+        if (['JD', 'SN'].includes(topic.value.qnsTyp)) {
+          topic.value.my_answer = [];
+        }
+        common.hideLoading();
+      });
+};
 
-	// 录音组件提交
-	const touchBtnSubmit = (type, submitObj) => {
-		const topic = topicList[questionNumber.value];
-		touchBtnRef.value?.clearinputText(); // 清除发送框数据
-		if (type === 'voice') {
-			if (topic.es_status == '00') return;
-			topic.es_status = '00'; // 00转圈
-			const voicePath = submitObj;
-			commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
-				.then((res) => {
-					let _res = JSON.parse(res.data);
-					if (_res.rtnCode === '0000') {
-						const _content = _res.body.transContent.trim();
-						if (_content === '') {
-							topic.es_status = ''; // 取消转圈
-							return common.msg('未识别到文字');
-						} else {
-							topic.es_status = '02';
-							topic.my_answer = {
-								anserResult: _res.body.transContent,
-								ossKey: _res.body.fileId,
-								ossAddr: _res.body.ossFileAddr,
-								voicePath: voicePath
-							};
-						}
-					}
-				})
-				.catch((error) => {
-					topic.es_status = ''; // 取消转圈
-					if (error === 'Other') {
-						common.msg('系统异常，请联系管理员');
-					}
-				});
-		} else if (type === 'text') {
-			topic.es_status = '01';
-			topic.my_answer = {
-				anserResult: submitObj // 正确答案文字内容
-			};
-		}
-	};
+// 问答题轮询结果方法
+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 addProblem = () => {
-		if (topicList.length >= storageTopicList.value.length) {
-			return false;
-		}
-		topicList.push(storageTopicList.value[topicList.length]);
-		return true;
-	};
-	// 初始化时检查
-	onLoad(() => {
-		const practice = getPageCache('practice');
-		if (!practice) {
-			common.navigateBack();
-			return;
-		}
-		paperData.crsId = practice.crsId;
-		paperData.name = practice.name;
-		paperData.exrId = practice.exrId;
-		storageTopicList.value = practice.qnsInfoVos.map((res) => ({
-			...res,
-			isPreview: false,
-			clearResult: true,
-			es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
-			my_answer: []
-		}));
-		addProblem();
-		// 记录练习起始时间
-		practiceStartTime = new Date().getTime();
-		setupKeyboardHeightListener((height) => {
-			popup_input_bottom.value = `${height}px`;
-			console.log('需要卸载吗');
-		});
-	});
-	const result_click = async ({ key }) => {
-		isTriggered.value = false; // 恢复
-		if (key === 'exit') {
-			// 中途退出
-			dialogRef.value.close();
-			common.loading();
-			try {
-				await practiceCommit({ exrId: paperData.exrId, examLenTm: practiceTime.value, stat: 'U' });
-			} catch (e) {}
-			common.navigateBack();
-			common.hideLoading();
-		} 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('交卷按钮');
-		const stat = 'P';
-		// 都做完弹窗了，产品说改成跳页，说客户觉得奇怪
-		common.redirectTo(
-			`/pages/practice/result?name=${paperData.name}&exrId=${paperData.exrId}&crsId=${paperData.crsId}&examLenTm=${practiceTime.value}&stat=${stat}`
-		);
-		// 完成
-		// 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 = () => {
-		if (practiceTimeTimer) {
-			clearInterval(practiceTimeTimer);
-		}
-		practiceTimeTimer = setInterval(() => {
-			const currentTime = Date.now();
-			const elapsedSeconds = Math.floor((currentTime - practiceStartTime - leaveDuration) / 1000);
-			practiceTime.value = elapsedSeconds;
-		}, 1000);
-	};
-	// 暂停定时器
-	const stopTimer = () => {
-		if (practiceTimeTimer) {
-			clearInterval(practiceTimeTimer);
-			practiceTimeTimer = null;
-		}
-	};
-	onShow(() => {
-		if (leaveStartTime) {
-			const time = Date.now() - leaveStartTime;
-			leaveDuration += time;
-			leaveStartTime = 0; // 重置离开开始时间
-		}
-		startTimer(); // 启动/恢复定时器
-	});
-	onHide(() => {
-		leaveStartTime = new Date().getTime();
-		stopTimer();
-	});
-	onUnload(() => {
-		stopTimer();
-	});
-	onBackPress((res) => res.from === 'backbutton');
+// 录音组件提交
+const touchBtnSubmit = (type, submitObj) => {
+  const topic = topicList[questionNumber.value];
+  touchBtnRef.value?.clearinputText(); // 清除发送框数据
+  if (type === 'voice') {
+    if (topic.es_status == '00') return;
+    topic.es_status = '00'; // 00转圈
+    const voicePath = submitObj;
+    commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
+        .then((_res) => {
+          const _content = _res.body.transContent.trim();
+          if (_content === '') {
+            topic.es_status = ''; // 取消转圈
+            return common.msg('未识别到文字');
+          } else {
+            topic.es_status = '02';
+            topic.my_answer = {
+              anserResult: _res.body.transContent,
+              ossKey: _res.body.fileId,
+              ossAddr: _res.body.ossFileAddr,
+              voicePath: voicePath
+            };
+          }
+
+        })
+        .catch((error) => {
+          topic.es_status = ''; // 取消转圈
+          if (error === 'Other') {
+            common.msg('系统异常，请联系管理员');
+          }
+        });
+  } else if (type === 'text') {
+    topic.es_status = '01';
+    topic.my_answer = {
+      anserResult: submitObj // 正确答案文字内容
+    };
+  }
+};
+
+// 添加一道题
+const addProblem = () => {
+  if (topicList.length >= storageTopicList.value.length) {
+    return false;
+  }
+  topicList.push(storageTopicList.value[topicList.length]);
+  return true;
+};
+// 初始化时检查
+onLoad(() => {
+  const practice = getPageCache('practice');
+  if (!practice) {
+    common.navigateBack();
+    return;
+  }
+  paperData.crsId = practice.crsId;
+  paperData.name = practice.name;
+  paperData.exrId = practice.exrId;
+  storageTopicList.value = practice.qnsInfoVos.map((res) => ({
+    ...res,
+    isPreview: false,
+    clearResult: true,
+    es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
+    my_answer: []
+  }));
+  addProblem();
+  // 记录练习起始时间
+  practiceStartTime = new Date().getTime();
+  setupKeyboardHeightListener((height) => {
+    popup_input_bottom.value = `${height}px`;
+    console.log('需要卸载吗');
+  });
+});
+const result_click = async ({key}) => {
+  isTriggered.value = false; // 恢复
+  if (key === 'exit') {
+    // 中途退出
+    dialogRef.value.close();
+    common.loading();
+    try {
+      await practiceCommit({exrId: paperData.exrId, examLenTm: practiceTime.value, stat: 'U'});
+    } catch (e) {
+    }
+    common.navigateBack();
+    common.hideLoading();
+  } 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('交卷按钮');
+  const stat = 'P';
+  // 都做完弹窗了，产品说改成跳页，说客户觉得奇怪
+  common.redirectTo(
+      `/pages/practice/result?name=${paperData.name}&exrId=${paperData.exrId}&crsId=${paperData.crsId}&examLenTm=${practiceTime.value}&stat=${stat}`
+  );
+  // 完成
+  // 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 = () => {
+  if (practiceTimeTimer) {
+    clearInterval(practiceTimeTimer);
+  }
+  practiceTimeTimer = setInterval(() => {
+    const currentTime = Date.now();
+    const elapsedSeconds = Math.floor((currentTime - practiceStartTime - leaveDuration) / 1000);
+    practiceTime.value = elapsedSeconds;
+  }, 1000);
+};
+// 暂停定时器
+const stopTimer = () => {
+  if (practiceTimeTimer) {
+    clearInterval(practiceTimeTimer);
+    practiceTimeTimer = null;
+  }
+};
+onShow(() => {
+  if (leaveStartTime) {
+    const time = Date.now() - leaveStartTime;
+    leaveDuration += time;
+    leaveStartTime = 0; // 重置离开开始时间
+  }
+  startTimer(); // 启动/恢复定时器
+});
+onHide(() => {
+  leaveStartTime = new Date().getTime();
+  stopTimer();
+});
+onUnload(() => {
+  stopTimer();
+});
+onBackPress((res) => res.from === 'backbutton');
 </script>
 
 <style scoped lang="scss">
-	$bg-margin-left: 30rpx;
+$bg-margin-left: 30rpx;
 
-	.popup_title_text {
-		color: red;
-	}
+.popup_title_text {
+  color: red;
+}
 
-	.popup {
-		//答题卡
-		z-index: 1800;
-		padding: 0 38rpx;
+.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;
+  .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;
-			}
+    .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;
+    .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;
-				}
-			}
+      .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 {
+      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;
-				}
+      .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;
-				}
+      .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;
-				}
+      .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;
-				}
+      .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;
-				}
-			}
+      .current.mark {
+        // 已完成
+        background-color: rgba(0, 102, 255, 0.6);
+        color: #ffffff;
+        border-color: #e8b531;
+      }
+    }
 
-			.sheet_button {
-				width: 100%;
-			}
-		}
-	}
+    .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;
-	}
+.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 {
+  height: 0;
+  overflow: hidden;
+  transition: height 0.2s ease-out;
+}
 
-	.touch-btn-div.show {
-		height: 150rpx;
-	}
+.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;
+.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;
+  .sheet_button {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 0 70rpx;
 
-			.img {
-				width: 38rpx;
-				height: 40rpx;
-			}
+    .img {
+      width: 38rpx;
+      height: 40rpx;
+    }
 
-			.sheet_text {
-				margin-top: 8rpx;
-				font-family: PingFangSC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #000000;
-			}
-		}
+    .sheet_text {
+      margin-top: 8rpx;
+      font-family: PingFangSC;
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #000000;
+    }
+  }
 
-		.button_div {
-			flex: 1;
+  .button_div {
+    flex: 1;
 
-			display: flex;
-			justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
 
-			.button {
-				flex: 1;
-			}
-		}
-	}
+    .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);
-	}
+.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;
-	}
+.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;
+.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;
-		}
-	}
+  .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;
+.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;
-		}
+  .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;
-			width: 242rpx;
-			flex-wrap: nowrap;
-			.grey {
-				margin-right: 8rpx;
-			}
-			.countdown_time {
-				white-space: nowrap;
-			}
-			color: #ffffff;
-			font-weight: 600;
-			font-size: 26rpx;
-		}
+  .question {
+    display: flex;
+    align-items: center;
+    width: 242rpx;
+    flex-wrap: nowrap;
 
-		.grey {
-			color: #b6e2ff;
-			white-space: nowrap;
-		}
+    .grey {
+      margin-right: 8rpx;
+    }
 
-		.bold {
-			font-weight: 600;
-		}
-	}
+    .countdown_time {
+      white-space: nowrap;
+    }
 
-	.nav-div {
-		position: relative;
+    color: #ffffff;
+    font-weight: 600;
+    font-size: 26rpx;
+  }
 
-		.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;
-		}
+  .grey {
+    color: #b6e2ff;
+    white-space: nowrap;
+  }
 
-		.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;
-			}
-		}
-	}
+  .bold {
+    font-weight: 600;
+  }
+}
 
-	.main_div {
-		display: flex;
-		flex-direction: column;
-		background: linear-gradient(to top, #3480ff, #0066ff);
-		/* 确保背景占满整个视口高度 */
-		min-height: 100vh;
-		margin: 0;
-	}
+.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;
+    }
+  }
+}
+
+.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/setting/index.vue b/src/pages/setting/index.vue
index f3292b30..0b5bfb55 100644
--- a/src/pages/setting/index.vue
+++ b/src/pages/setting/index.vue
@@ -20,37 +20,8 @@
 						</view>
 					</template>
 				</uv-cell>
-				<!-- <uv-cell name="sex" isLink title="性别">
-					<template #title>
-						<text class="font_pf">性别</text>
-					</template>
-					<template #value>
-						<picker
-							mode="selector"
-							:value="index"
-							range-key="label"
-							style="width: 100%"
-							:range="sexOptions"
-							@change="sexChange"
-						>
-							<view style="text-align: right">{{ showGenderText }}</view>
-						</picker>
-					</template>
-				</uv-cell> -->
-
 				<uv-cell title="性别" @click="sexPicker.open()" :isLink="true" :value="showGenderText"></uv-cell>
 				<uv-cell title="百禄形象" @click="gotoMascot()" :isLink="true" :border="false" :value="mascotName"></uv-cell>
-				<!-- 	<uv-cell :isLink="true" :border="false">
-					<template #title>
-						<text class="font_pf">竞赛是否匿名</text>
-					</template>
-					<template #value>
-						<picker mode="selector" :value="index" range-key="label" style="width: 100%"
-							:range="anonymousOptions" @change="anonymousChange">
-							<view style="text-align: right">{{showAnonymousText}}</view>
-						</picker>
-					</template>
-				</uv-cell> -->
 			</uv-cell-group>
 		</view>
 		<avatar-cropper
@@ -60,8 +31,8 @@
 			:width="500"
 			:height="500"
 			:delay="150"
-			@cancel="onCancel"
-			@confirm="onConfirm"
+			@cancel="avatarOnCancel"
+			@confirm="avatarOnConfirm"
 		></avatar-cropper>
 		<uv-picker ref="sexPicker" :columns="[sexOptions]" keyName="label" @confirm="sexConfirm"></uv-picker>
 	</view>
@@ -69,26 +40,31 @@
 
 <script setup>
 	import { reactive, ref, computed, nextTick } from 'vue';
-	import { onLoad } from '@dcloudio/uni-app';
+	import { onLoad, onShow } from '@dcloudio/uni-app';
 	import { uploadFile } from '@/api/common';
 	import { queryCurrentUser } from '@/api/login.js';
 	import common from '@/common/common';
 	import { getUserInfo } from '@/common/common';
 	import { GENDER } from '@/enum.js';
-	import { updateDfSysUserExtandInfoGender, updateDfSysUserExtandInfoImageAddr } from '@/api/user.js';
+	import { updateDfSysUserExtandInfoGender } from '@/api/user.js';
 	import { queryValidTraMascotInfo } from '@/api/mascot.js';
 	import { get_base_url } from '@/api/request.js';
 	const index = ref(0);
 	const sexPicker = ref(null);
-	const avatarCropperUrl = ref('');
-	
 	const userInfo = ref({
 		gender: '',
 		imagePath: '',
 		imageAddr: '',
 		mascotInfo: null
 	});
-	const avatarCropperStatus = ref(true);
+	import useUpdateAvatar from '@/composables/useUpdateAvatar';
+	const { avatarCropperUrl, click_update_avatar, avatarCropperStatus, avatarOnCancel, avatarOnConfirm } = useUpdateAvatar({
+		success: (userData) => {
+			userInfo.value.imageAddr = userData.imageAddr;
+			userInfo.value.imagePath = '';
+		}
+	});
+
 	const mascotName = computed(() => userInfo.value.mascotInfo?.mascotName || '');
 	const sexOptions = GENDER;
 	const anonymousOptions = [
@@ -106,7 +82,7 @@
 	const gotoMascot = () => {
 		common.navigateTo('/pages/mascot/mascot_select_list?from=setting');
 	};
-	
+
 	// 显示性别的计算属性
 	const showGenderText = computed(() => {
 		const item = sexOptions.find((item) => item.value === userInfo.value.gender);
@@ -117,67 +93,6 @@
 		}
 	});
 
-	// 显示是否匿名的计算属性
-	const showAnonymousText = computed(() => {
-		const item = anonymousOptions.find((item) => item.value === userInfo.value?.anonymous);
-		if (item) {
-			return item.label;
-		} else {
-			return '否';
-		}
-	});
-	// 点击修改头像
-	const click_update_avatar = () => {
-		uni.chooseImage({
-			count: 1,
-			sizeType: ['compressed'],
-			success: (resPicture) => {
-				uni.getFileInfo({
-					filePath: resPicture.tempFilePaths[0],
-					success: function (resSize) {
-						if (resSize.size > 10 * 1024 * 1024) return common.msg('图片过大，请重新选择');
-						avatarCropperUrl.value = resPicture.tempFilePaths[0];
-						avatarCropperStatus.value = true;
-					},
-					fail: function (err) {
-						common.msg('获取图片失败，请选择其他图片');
-					}
-				});
-			}
-		});
-	};
-	// 选择头像取消
-	const onCancel = (value) => {
-		avatarCropperStatus.value = false;
-	};
-	// 选择头像确定
-	const onConfirm = (file) => {
-		avatarCropperStatus.value = false;
-		nextTick(async () => {
-			common.loading('更新头像中');
-			try {
-				const data = {
-					bizScen: 'S3007',
-					thumbnailFlag: true,
-					thumbImgSize: 100
-				};
-				// 上传图片
-				const res = await uploadFile(file.tempFilePath, data);
-				// 更新个人信息
-				await updateDfSysUserExtandInfoImageAddr({
-					imageAddr: res.thumbFileId
-				});
-				// 更新个人信息
-				const userData = await queryCurrentUser();
-				common.msg('修改成功');
-				userInfo.value.imageAddr = userData.imageAddr;
-				userInfo.value.imagePath = '';
-			} catch {
-				common.msg('修改失败');
-			}
-			common.hideLoading();
-		});
-	};
 	// 修改性别
 	const sexConfirm = (e) => {
 		userInfo.value.gender = e.value[0].value;
@@ -193,29 +108,8 @@
 				common.hideLoading();
 			});
 	};
-	
-	// const sexChange = (e) => {
-	// 	userInfo.value.gender = sexOptions[e.detail.value].value;
-	// 	console.log('userInfo.value.gender', userInfo.value.gender);
-	// 	common.loading('修改中');
-	// 	updateDfSysUserExtandInfoGender({
-	// 		gender: userInfo.value.gender
-	// 	})
-	// 		.then(async () => {
-	// 			await queryCurrentUser();
-	// 			common.msg('修改成功');
-	// 		})
-	// 		.finally(() => {
-	// 			common.hideLoading();
-	// 		});
-	// };
-	
-	const anonymousChange = (e) => {
-		userInfo.value.anonymous = anonymousOptions[e.detail.value].value;
-		common.msg('修改成功');
-	};
 
-	onLoad((params) => {
+	onShow((params) => {
 		userInfo.value = getUserInfo();
 		console.log('userInfo.value，', userInfo.value);
 	});
diff --git a/src/pages/wrongQuestionRecord/correct.vue b/src/pages/wrongQuestionRecord/correct.vue
index 14eeb2d1..5a0db484 100644
--- a/src/pages/wrongQuestionRecord/correct.vue
+++ b/src/pages/wrongQuestionRecord/correct.vue
@@ -1,789 +1,792 @@
 <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">
-							<view class="" v-if="item === '00'">加载中</view>
+  <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">
+              <view class="" v-if="item === '00'">加载中</view>
 
-							<view class="" v-if="item === '01'">加载失败</view>
-							<view class="" v-if="item === '02'">加载失败</view>
-							<Subject
-								v-else
-								: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>
+              <view class="" v-if="item === '01'">加载失败</view>
+              <view class="" v-if="item === '02'">加载失败</view>
+              <Subject
+                  v-else
+                  :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, nextTick } from 'vue';
-	import { onLoad, onHide, onShow, onUnload, onBackPress } 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 TouchBtn from '@/components/examination/touchBtn.vue';
-	import common from '@/common/common';
-	import { getPageCache, setupKeyboardHeightListener } from '@/common/common';
-	import { commonUploadVoiceFile } from '@/api/common.js';
-	import { practiceExitIcon } from '@/common/imgSvg';
-	import { queryMistakesAnswerByMisId, mistakesCorrect, queryMistakesCorrectByMisId } from '@/api/wrongQuestionRecord.js';
-	const feedbackRef = ref(null);
-	const dialogRef = ref(null);
-	const touchBtnRef = ref(null);
+import {ref, reactive, computed, nextTick} from 'vue';
+import {onLoad, onHide, onShow, onUnload, onBackPress} 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 TouchBtn from '@/components/examination/touchBtn.vue';
+import common from '@/common/common';
+import {getPageCache, setupKeyboardHeightListener} from '@/common/common';
+import {commonUploadVoiceFile} from '@/api/common.js';
+import {practiceExitIcon} from '@/common/imgSvg';
+import {queryMistakesAnswerByMisId, mistakesCorrect, queryMistakesCorrectByMisId} from '@/api/wrongQuestionRecord.js';
 
-	const mode = ref('practice'); // 考试 examination 练习practice
-	const paperData = reactive({
-		name: '' // 名称
-	}); // 试卷信息
-	const topicList = reactive([]); // 问题列表
-	const storageIdList = ref([]); // 所有题ID列表
-	const storageIdDict = ref({}); // 所有题ID为键的字典
-	const popup_input_bottom = ref('0px');
-	const questionNumber = ref(0); // 题号
+const feedbackRef = ref(null);
+const dialogRef = ref(null);
+const touchBtnRef = ref(null);
 
-	// 根据课程ID获取课程的题目  undefined为没有， 00为加载中， 02为加载失败
-	const topic = computed({
-		get: () => topicList[questionNumber.value],
-		set: (val) => (topicList[questionNumber.value] = val)
-	});
+const mode = ref('practice'); // 考试 examination 练习practice
+const paperData = reactive({
+  name: '' // 名称
+}); // 试卷信息
+const topicList = reactive([]); // 问题列表
+const storageIdList = ref([]); // 所有题ID列表
+const storageIdDict = ref({}); // 所有题ID为键的字典
+const popup_input_bottom = ref('0px');
+const questionNumber = ref(0); // 题号
 
-	const showTouchBtn = computed(() => {
-		return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
-	});
+// 根据课程ID获取课程的题目  undefined为没有， 00为加载中， 02为加载失败
+const topic = computed({
+  get: () => topicList[questionNumber.value],
+  set: (val) => (topicList[questionNumber.value] = val)
+});
 
-	// 下面语音组件的禁用状态判断
-	const touchIsDisabled = computed(() => topic.value?.es_status !== '' && topic.value?.es_status !== undefined);
+const showTouchBtn = computed(() => {
+  return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
+});
 
-	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 touchIsDisabled = computed(() => topic.value?.es_status !== '' && topic.value?.es_status !== undefined);
 
-	// 滑动切换
-	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(
-		() => storageIdList.value.length === finishCurrent.value + 1 && finishCurrent.value === questionNumber.value
-	);
+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 transition = (event) => {
-		if (isTriggered.value) return;
-		const dx = event.detail.dx;
-		if (dx > 90 && dx < 250 && 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 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(
+    () => storageIdList.value.length === finishCurrent.value + 1 && finishCurrent.value === questionNumber.value
+);
 
-	// 单题回答
-	const submitProblem = (answer) => {
-		const topic = topicList[questionNumber.value];
-		common.loading('答题中');
-		mistakesCorrect({
-			misId: topic.misId,
-			ossKey: '',
-			...answer
-		})
-			.then(async (res) => {
-				let traQnsInfoVo;
-				// 是问答题
-				if (topic.qnsTyp === 'ES') {
-					try {
-						const result = await queryWithRetry(topic.misId);
-						console.log(result, 'result');
-						traQnsInfoVo = result.body.traQnsInfoVo;
-					} catch (e) {
-						common.hideLoading();
-						topic.isPreview = false;
-						return;
-					}
-				} else {
-					traQnsInfoVo = res.body;
-				}
-				topic.isPreview = true; // 不能在点击了，打开预览模式
-				common.hideLoading();
-				topic.clearResult = false; // 不清除正确答案
-				topic.analyContent = traQnsInfoVo.analyContent; // 答案解析
-				// 更新选项正确项目
-				topic.itemVos = traQnsInfoVo.itemVos; // 答案选项（todo应该不这样替换）
-				topic.anserResult = traQnsInfoVo.anserResult; // 正确答案字符串分割
-				topic.judgeResult = traQnsInfoVo.judgeResult; // 正确答案字符串分割
-				const judgeResultStatus = traQnsInfoVo.judgeResult === 'P'; // P为正确U为错误
-				// 加载下一题
-				if (!addProblem(questionNumber.value + 1)) {
-					// 返回false说明到了最后一题
-					console.log('最后一题', topic.qnsTyp, !judgeResultStatus);
-					if (topic.qnsTyp === 'ES' || !judgeResultStatus) {
-						// 最后一题是问答题，或者答错了，都不自动弹出
-						return;
-					} else {
-						await hand_in_paper_button_click();
-					}
-				} else {
-					addRequestProblem(questionNumber.value + 1);
-					// 自动切换下一题的条件
-					if (
-						judgeResultStatus && // 条件1.答题正确
-						topic.qnsTyp !== 'ES' // 问答题答对打答错都不切换
-					) {
-						nextTick(() => {
-							setTimeout(() => {
-								questionNumber.value++;
-							}, 200);
-						});
-					}
-				}
-			})
-			.catch(() => {
-				// 单选和判断需要清除已点击的按钮
-				if (['JD', 'SN'].includes(topic.qnsTyp)) {
-					topic.my_answer = [];
-				}
-				common.hideLoading();
-			});
-	};
+const transition = (event) => {
+  if (isTriggered.value) return;
+  const dx = event.detail.dx;
+  if (dx > 90 && dx < 250 && 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 queryWithRetry = (execLogId, maxRetries = 10) => {
-		// 递归终止条件：达到最大重试次数
-		if (maxRetries <= 0) {
-			return Promise.reject(new Error('超过最大重试次数，查询失败'));
-		}
-		return queryMistakesCorrectByMisId({ misId: execLogId })
-			.then((res) => {
-				console.log('queryMistakesCorrectByMisId', 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 submitProblem = (answer) => {
+  const topic = topicList[questionNumber.value];
+  common.loading('答题中');
+  mistakesCorrect({
+    misId: topic.misId,
+    ossKey: '',
+    ...answer
+  })
+      .then(async (res) => {
+        let traQnsInfoVo;
+        // 是问答题
+        if (topic.qnsTyp === 'ES') {
+          try {
+            const result = await queryWithRetry(topic.misId);
+            console.log(result, 'result');
+            traQnsInfoVo = result.body.traQnsInfoVo;
+          } catch (e) {
+            common.hideLoading();
+            topic.isPreview = false;
+            return;
+          }
+        } else {
+          traQnsInfoVo = res.body;
+        }
+        topic.isPreview = true; // 不能在点击了，打开预览模式
+        common.hideLoading();
+        topic.clearResult = false; // 不清除正确答案
+        topic.analyContent = traQnsInfoVo.analyContent; // 答案解析
+        // 更新选项正确项目
+        topic.itemVos = traQnsInfoVo.itemVos; // 答案选项（todo应该不这样替换）
+        topic.anserResult = traQnsInfoVo.anserResult; // 正确答案字符串分割
+        topic.judgeResult = traQnsInfoVo.judgeResult; // 正确答案字符串分割
+        const judgeResultStatus = traQnsInfoVo.judgeResult === 'P'; // P为正确U为错误
+        // 加载下一题
+        if (!addProblem(questionNumber.value + 1)) {
+          // 返回false说明到了最后一题
+          console.log('最后一题', topic.qnsTyp, !judgeResultStatus);
+          if (topic.qnsTyp === 'ES' || !judgeResultStatus) {
+            // 最后一题是问答题，或者答错了，都不自动弹出
+            return;
+          } else {
+            await hand_in_paper_button_click();
+          }
+        } else {
+          addRequestProblem(questionNumber.value + 1);
+          // 自动切换下一题的条件
+          if (
+              judgeResultStatus && // 条件1.答题正确
+              topic.qnsTyp !== 'ES' // 问答题答对打答错都不切换
+          ) {
+            nextTick(() => {
+              setTimeout(() => {
+                questionNumber.value++;
+              }, 200);
+            });
+          }
+        }
+      })
+      .catch(() => {
+        // 单选和判断需要清除已点击的按钮
+        if (['JD', 'SN'].includes(topic.qnsTyp)) {
+          topic.my_answer = [];
+        }
+        common.hideLoading();
+      });
+};
 
-	// 录音组件提交
-	const touchBtnSubmit = (type, submitObj) => {
-		const topic = topicList[questionNumber.value];
-		touchBtnRef.value?.clearinputText(); // 清除发送框数据
-		console.log('录音组件提交');
-		if (type === 'voice') {
-			if(topic.es_status == '00') return;
-			topic.es_status = '00'; // 00转圈
-			const voicePath = submitObj;
-			commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
-				.then((res) => {
-					console.log('_contentsssss', res);
-					let _res = JSON.parse(res.data);
-					if (_res.rtnCode === '0000') {
-						const _content = _res.body.transContent.trim();
-						console.log('_content', _content);
-						if (_content === '') {
-							topic.es_status = ''; // 取消转圈
-							console.log('未识别到文字');
-							return common.msg('未识别到文字');
-						} else {
-							console.log('识别到了文字', _content);
-							topic.es_status = '02';
-							topic.my_answer = {
-								anserResult: _res.body.transContent,
-								ossKey: _res.body.fileId,
-								ossAddr: _res.body.ossFileAddr,
-								voicePath: voicePath
-							};
-						}
-					}
-				})
-				.catch((error) => {
-					topic.es_status = ''; // 取消转圈
-					if (error === 'Other') {
-						common.msg('系统异常，请联系管理员');
-					}
-				});
-		} else if (type === 'text') {
-			topic.es_status = '01';
-			topic.my_answer = {
-				anserResult: submitObj // 正确答案文字内容
-			};
-		}
-	};
+// 问答题轮询结果方法
+const queryWithRetry = (execLogId, maxRetries = 10) => {
+  // 递归终止条件：达到最大重试次数
+  if (maxRetries <= 0) {
+    return Promise.reject(new Error('超过最大重试次数，查询失败'));
+  }
+  return queryMistakesCorrectByMisId({misId: execLogId})
+      .then((res) => {
+        console.log('queryMistakesCorrectByMisId', 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 addProblem = (index) => {
-		// index 要加载的题号
-		if (topicList.length >= storageIdList.value.length) return false; // 说明已经加载所有题了
-		if (index < topicList.length) return true; // 说明此题已经加载
-		console.log('xxx', topicList.length, storageIdList.value.length);
+// 录音组件提交
+const touchBtnSubmit = (type, submitObj) => {
+  const topic = topicList[questionNumber.value];
+  touchBtnRef.value?.clearinputText(); // 清除发送框数据
+  console.log('录音组件提交');
+  if (type === 'voice') {
+    if (topic.es_status == '00') return;
+    topic.es_status = '00'; // 00转圈
+    const voicePath = submitObj;
+    commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
+        .then((_res) => {
+          const _content = _res.body.transContent.trim();
+          console.log('_content', _content);
+          if (_content === '') {
+            topic.es_status = ''; // 取消转圈
+            console.log('未识别到文字');
+            return common.msg('未识别到文字');
+          } else {
+            console.log('识别到了文字', _content);
+            topic.es_status = '02';
+            topic.my_answer = {
+              anserResult: _res.body.transContent,
+              ossKey: _res.body.fileId,
+              ossAddr: _res.body.ossFileAddr,
+              voicePath: voicePath
+            };
+          }
+        })
+        .catch((error) => {
+          topic.es_status = ''; // 取消转圈
+          if (error === 'Other') {
+            common.msg('系统异常，请联系管理员');
+          }
+        });
+  } else if (type === 'text') {
+    topic.es_status = '01';
+    topic.my_answer = {
+      anserResult: submitObj // 正确答案文字内容
+    };
+  }
+};
 
-		const id = storageIdList.value[index]; // 找到id
-		if (storageIdDict.value[id] === undefined) {
-			//尚未加载（几乎不可能）
-			return true;
-		} else if (storageIdDict.value[id].state === '00') {
-			//加载中
-		} else if (storageIdDict.value[id].state === '01') {
-			// 已经加载
-			// console.log('增加已经加载的数据', storageIdDict.value[id].topic);
-			topicList.push(storageIdDict.value[id].topic);
-			return true;
-		} else if (storageIdDict.value[id].state === '02') {
-			//加载失败
-		}
-		topicList.push(storageIdDict.value[id].state);
-		return true;
-	};
+// 添加下一道题
+const addProblem = (index) => {
+  // index 要加载的题号
+  if (topicList.length >= storageIdList.value.length) return false; // 说明已经加载所有题了
+  if (index < topicList.length) return true; // 说明此题已经加载
+  console.log('xxx', topicList.length, storageIdList.value.length);
 
-	// 网络加载题，并且放起来
-	const addRequestProblem = async (index, success = () => {}) => {
-		const id = storageIdList.value[index];
-		const preload = () => {
-			nextTick(() => {
-				// 最多只预加载当前题号的后两道题（questionNumber.value是当前题号）
-				// 修正索引判断：确保 index + 1 是有效的数组索引（< 数组长度）
-				if (index + 1 === storageIdList.value.length) return; // 防止下标越界
-				if (index + 1 > questionNumber.value + 2) return; // 防止加载太多
-				const last_id = storageIdList.value[index + 1];
-				// 判断是否加载
-				if (last_id in storageIdDict.value) {
-					return;
-				} else {
-					addRequestProblem(index + 1, success);
-				}
-			});
-		};
+  const id = storageIdList.value[index]; // 找到id
+  if (storageIdDict.value[id] === undefined) {
+    //尚未加载（几乎不可能）
+    return true;
+  } else if (storageIdDict.value[id].state === '00') {
+    //加载中
+  } else if (storageIdDict.value[id].state === '01') {
+    // 已经加载
+    // console.log('增加已经加载的数据', storageIdDict.value[id].topic);
+    topicList.push(storageIdDict.value[id].topic);
+    return true;
+  } else if (storageIdDict.value[id].state === '02') {
+    //加载失败
+  }
+  topicList.push(storageIdDict.value[id].state);
+  return true;
+};
 
-		if (storageIdDict.value[id] && storageIdDict.value[id].state === '01') {
-			preload();
-			return;
-		}
+// 网络加载题，并且放起来
+const addRequestProblem = async (index, success = () => {
+}) => {
+  const id = storageIdList.value[index];
+  const preload = () => {
+    nextTick(() => {
+      // 最多只预加载当前题号的后两道题（questionNumber.value是当前题号）
+      // 修正索引判断：确保 index + 1 是有效的数组索引（< 数组长度）
+      if (index + 1 === storageIdList.value.length) return; // 防止下标越界
+      if (index + 1 > questionNumber.value + 2) return; // 防止加载太多
+      const last_id = storageIdList.value[index + 1];
+      // 判断是否加载
+      if (last_id in storageIdDict.value) {
+        return;
+      } else {
+        addRequestProblem(index + 1, success);
+      }
+    });
+  };
 
-		storageIdDict.value[id] = { state: '00' };
-		queryMistakesAnswerByMisId({ misId: id })
-			.then(({ body }) => {
-				const topic_item = {
-					...body,
-					isPreview: false,
-					clearResult: true,
-					es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
-					my_answer: [],
-					// 这里是给后端擦屁股的代码，都是些新题不该存在的数据
-					judgeResult: ''
-				};
-				storageIdDict.value[id] = {
-					state: '01',
-					topic: topic_item
-				};
-				success(topic_item);
-				preload();
-			})
-			.catch(() => {
-				storageIdDict.value[id] = { state: '02' };
-			})
-			.finally(() => {
-				// if (isLoading) common.hideLoading();
-			});
-	};
-	// 初始化时检查
-	onLoad(() => {
-		const correct = getPageCache('correct');
-		if (!correct) {
-			return common.navigateBack();
-		}
-		paperData.name = correct.name;
-		storageIdList.value = correct.list;
+  if (storageIdDict.value[id] && storageIdDict.value[id].state === '01') {
+    preload();
+    return;
+  }
 
-		setupKeyboardHeightListener((height) => {
-			popup_input_bottom.value = `${height}px`;
-		});
+  storageIdDict.value[id] = {state: '00'};
+  queryMistakesAnswerByMisId({misId: id})
+      .then(({body}) => {
+        const topic_item = {
+          ...body,
+          isPreview: false,
+          clearResult: true,
+          es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定
+          my_answer: [],
+          // 这里是给后端擦屁股的代码，都是些新题不该存在的数据
+          judgeResult: ''
+        };
+        storageIdDict.value[id] = {
+          state: '01',
+          topic: topic_item
+        };
+        success(topic_item);
+        preload();
+      })
+      .catch(() => {
+        storageIdDict.value[id] = {state: '02'};
+      })
+      .finally(() => {
+        // if (isLoading) common.hideLoading();
+      });
+};
+// 初始化时检查
+onLoad(() => {
+  const correct = getPageCache('correct');
+  if (!correct) {
+    return common.navigateBack();
+  }
+  paperData.name = correct.name;
+  storageIdList.value = correct.list;
 
-		setTimeout(() => {
-			addRequestProblem(0, () => {
-				addProblem(0);
-			});
-		}, 10);
-	});
+  setupKeyboardHeightListener((height) => {
+    popup_input_bottom.value = `${height}px`;
+  });
 
-	const result_click = ({ key }) => {
-		isTriggered.value = false; // 恢复
-		if (key === 'return') {
-			// 返回
-			dialogRef.value.close();
-			// await nextTick();
-			common.navigateBack();
-		} else if (key === 'exit') {
-			// 中途退出
-			// dialogRef.value.close();
-			// await nextTick();
-			console.log('下11', '退出');
-			common.navigateBack();
-			console.log('下1', '退出');
-		} 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('交卷按钮');
-		const stat = 'P';
-		common.redirectTo(`/pages/wrongQuestionRecord/result?stat=${stat}`);
-	};
+  setTimeout(() => {
+    addRequestProblem(0, () => {
+      addProblem(0);
+    });
+  }, 10);
+});
 
-	// 中途退出
-	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(() => {
-		const pages = getCurrentPages();
-		if (pages.length >= 2) {
-			const prevPage = pages[pages.length - 2];
-			if (prevPage.route === 'pages/wrongQuestionRecord/index') {
-				if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.reload === 'function') {
-					prevPage.$vm.$?.exposed?.reload();
-				}
-			}
-		}
-	});
-	onBackPress((res) => res.from === 'backbutton');
+const result_click = ({key}) => {
+  isTriggered.value = false; // 恢复
+  if (key === 'return') {
+    // 返回
+    dialogRef.value.close();
+    // await nextTick();
+    common.navigateBack();
+  } else if (key === 'exit') {
+    // 中途退出
+    // dialogRef.value.close();
+    // await nextTick();
+    console.log('下11', '退出');
+    common.navigateBack();
+    console.log('下1', '退出');
+  } 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('交卷按钮');
+  const stat = 'P';
+  common.redirectTo(`/pages/wrongQuestionRecord/result?stat=${stat}`);
+};
+
+// 中途退出
+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(() => {
+  const pages = getCurrentPages();
+  if (pages.length >= 2) {
+    const prevPage = pages[pages.length - 2];
+    if (prevPage.route === 'pages/wrongQuestionRecord/index') {
+      if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.reload === 'function') {
+        prevPage.$vm.$?.exposed?.reload();
+      }
+    }
+  }
+});
+onBackPress((res) => res.from === 'backbutton');
 </script>
 
 <style scoped lang="scss">
-	$bg-margin-left: 30rpx;
+$bg-margin-left: 30rpx;
 
-	.popup_title_text {
-		color: red;
-	}
+.popup_title_text {
+  color: red;
+}
 
-	.popup {
-		//答题卡
-		z-index: 1800;
-		padding: 0 38rpx;
+.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;
+  .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;
-			}
+    .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;
+    .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;
-				}
-			}
+      .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 {
+      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;
-				}
+      .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;
-				}
+      .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;
-				}
+      .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;
-				}
+      .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;
-				}
-			}
+      .current.mark {
+        // 已完成
+        background-color: rgba(0, 102, 255, 0.6);
+        color: #ffffff;
+        border-color: #e8b531;
+      }
+    }
 
-			.sheet_button {
-				width: 100%;
-			}
-		}
-	}
+    .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;
-	}
+.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 {
+  height: 0;
+  overflow: hidden;
+  transition: height 0.2s ease-out;
+}
 
-	.touch-btn-div.show {
-		height: 150rpx;
-	}
+.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;
+.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;
+  .sheet_button {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 0 70rpx;
 
-			.img {
-				width: 38rpx;
-				height: 40rpx;
-			}
+    .img {
+      width: 38rpx;
+      height: 40rpx;
+    }
 
-			.sheet_text {
-				margin-top: 8rpx;
-				font-family: PingFangSC;
-				font-weight: 500;
-				font-size: 24rpx;
-				color: #000000;
-			}
-		}
+    .sheet_text {
+      margin-top: 8rpx;
+      font-family: PingFangSC;
+      font-weight: 500;
+      font-size: 24rpx;
+      color: #000000;
+    }
+  }
 
-		.button_div {
-			flex: 1;
+  .button_div {
+    flex: 1;
 
-			display: flex;
-			justify-content: space-between;
+    display: flex;
+    justify-content: space-between;
 
-			.button {
-				flex: 1;
-			}
-		}
-	}
+    .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);
-	}
+.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;
-	}
+.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;
+.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;
-		}
-	}
+  .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;
+.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;
-		}
+  .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;
+  .question {
+    display: flex;
+    align-items: center;
+    // background-color: red;
+    width: 242rpx;
 
-			.grey {
-				margin-right: 8rpx;
-			}
-			color: #ffffff;
-			font-weight: 600;
-			font-size: 26rpx;
-		}
+    .grey {
+      margin-right: 8rpx;
+    }
 
-		.grey {
-			color: #b6e2ff;
-		}
+    color: #ffffff;
+    font-weight: 600;
+    font-size: 26rpx;
+  }
 
-		.bold {
-			font-weight: 600;
-		}
-	}
+  .grey {
+    color: #b6e2ff;
+  }
 
-	.nav-div {
-		position: relative;
+  .bold {
+    font-weight: 600;
+  }
+}
 
-		.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;
-		}
+.nav-div {
+  position: relative;
 
-		.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;
-		}
-	}
+  .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;
+  }
 
-	.main_div {
-		display: flex;
-		flex-direction: column;
-		background: linear-gradient(to top, #3480ff, #0066ff);
-		/* 确保背景占满整个视口高度 */
-		min-height: 100vh;
-		margin: 0;
-	}
+  .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>

From eea33dd60424dbcf11eec86fd5f63579a241c22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Mon, 22 Sep 2025 15:49:16 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E5=90=8E=EF=BC=8C=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87=E4=B8=8D=E5=A4=8D=E5=8E=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                      | 2 +-
 src/components/examination/question.vue               | 3 +--
 src/pages/courseRecord/components/studyRecordList.vue | 3 +++
 src/pages/courseRecord/useItemList.js                 | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index 583a07ea..7d10ff90 100644
--- a/.env.development
+++ b/.env.development
@@ -18,7 +18,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # h5专用地址x2
 
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
diff --git a/src/components/examination/question.vue b/src/components/examination/question.vue
index c91821bc..14332801 100644
--- a/src/components/examination/question.vue
+++ b/src/components/examination/question.vue
@@ -219,8 +219,7 @@
 						innerAudio.setAudioSrc(res.tempFilePath);
 					});
 				} else if (newVal === undefined) {
-					
-					// innerAudio.stopAudio();
+					innerAudio.stopAudio();
 				} else {
 					voiceTime.value = '';
 					innerAudio.setAudioSrc(newVal);
diff --git a/src/pages/courseRecord/components/studyRecordList.vue b/src/pages/courseRecord/components/studyRecordList.vue
index 68427c58..67a037c0 100644
--- a/src/pages/courseRecord/components/studyRecordList.vue
+++ b/src/pages/courseRecord/components/studyRecordList.vue
@@ -29,9 +29,12 @@
 			}
 		});
 	};
+
+	// 自定义下拉刷新下拉结束
 	const refresherTouchend = () => {
 		clearAll();
 	};
+	
 	const props = defineProps<{
 		tabIndex: number;
 		currentIndex: number;
diff --git a/src/pages/courseRecord/useItemList.js b/src/pages/courseRecord/useItemList.js
index cde18d40..2ff3c9b1 100644
--- a/src/pages/courseRecord/useItemList.js
+++ b/src/pages/courseRecord/useItemList.js
@@ -98,6 +98,7 @@ export function useItemList(fetchFunction, item) {
 	const clear = () => {
 		total.value = -1
 		data_list.length = 0
+		show_list_state.value = false
 	}
 	return {
 		status,

From 63de38b2f8173c43cdb1afe6a1f679d5596e5844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 22 Sep 2025 15:50:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/components/talkingItem.vue | 193 +++++++++++---------
 src/pages/course/study.vue                  |   3 +
 2 files changed, 107 insertions(+), 89 deletions(-)

diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 6a3805ee..1c92653d 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -416,28 +416,36 @@
 		pauseVoice();
 	});
 	let prevTime = -1;
+	let pauseTime = -1;
 	talkVoiceObj.value.onEnded(() => {
 		console.log('onEnded');
-		emit('changePlay', '');
+		if(props.activeVoiceId){
+			emit('changePlay', '');
+		}
 		prevTime = -1;
+		pauseTime = prevTime
 		talkVoiceObj.value.src = '';
 	});
 	talkVoiceObj.value.onStop(() => {
 		console.log('onStop');
-		emit('changePlay', '');
+		if(props.activeVoiceId){
+			emit('changePlay', '');
+		}
 		prevTime = -1;
+		pauseTime = prevTime
 		talkVoiceObj.value.src = '';
 	});
 	talkVoiceObj.value.onPause(() => {
-		console.log('onPause');
 		prevTime = talkVoiceObj.value.currentTime;
-		emit('changePlay', '');
+		pauseTime = prevTime
 	});
 	talkVoiceObj.value.onPlay(() => {
 		console.log('onPlay');
 		prevTime = talkVoiceObj.value.currentTime;
+		pauseTime = prevTime
 		emit('changePlay', unref(dataInfo)?.id);
 	});
+	
 	talkVoiceObj.value.onTimeUpdate(() => {
 		if (activeVoiceId.value === unref(dataInfo)?.id) {
 			setTimeout(() => {
@@ -446,18 +454,22 @@
 						prevTime = talkVoiceObj.value.currentTime;
 					}
 				} else {
-					emit('changePlay', '');
+					if (props.isPlaying && (talkVoiceObj.value.currentTime > 0) && (pauseTime !== talkVoiceObj.value.currentTime) && props.activeVoiceId) {
+						emit('changePlay', '');
+					}
 				}
-			}, 500);
+			}, 100);
 		}
 	});
 
 	talkVoiceObj.value.onError(() => {
-		if(!talkVoiceObj.value.src) return
-		talkVoiceObj.value.src = '';
-		emit('changePlay', '');
+		// console.log('onError');
+		// if(!talkVoiceObj.value.src) return
+		// talkVoiceObj.value.src = '';
+		// emit('changePlay', '');
 	});
 	const pauseVoice = () => {
+		console.log('手动')
 		if (!talkVoiceObj.value) return;
 		talkVoiceObj.value.pause();
 		emit('changePlay', '');
@@ -478,92 +490,95 @@
 	};
 	const playVoice = (readType = 'pgth') => {
 		let _content = showContent.value;
-		console.log(_content);
 		if (!_content) {
 			common.msg('没有可以播放的文字信息！');
 			return;
 		}
-		emit('changePlay', unref(dataInfo)?.id);
-		// readType 阅读内容类型pgrh段落/qns问题
-		if (talkVoiceObj.value.src && talkVoiceObj.value.src === itemVoice.value) {
-			talkVoiceObj.value.play();
-			return;
-		}
-		talkVoiceObj.value.src = '';
-		if (itemVoice.value) {
-			setTimeout(() => {
-				talkVoiceObj.value.src = itemVoice.value;
+		setTimeout(() => {
+			emit('changePlay', unref(dataInfo)?.id);
+			console.log(1)
+			// readType 阅读内容类型pgrh段落/qns问题
+			if (talkVoiceObj.value.src && talkVoiceObj.value.src === itemVoice.value) {
 				talkVoiceObj.value.play();
-			}, 100);
-		} else {
-			voiceLoading.value = true;
-			let _type =
-				props.type == 2 ?
-				'ans' :
-				props.type == 3 ?
-				'pgrh' :
-				props.type == 4 ?
-				'qns' :
-				props.type == 5 ?
-				'analysis' :
-				props.type == 8 ?
-				'stemAnalysis' :
-				'';
-			let _readId =
-				props.type == 2 ?
-				unref(dataInfo)?.intrctId :
-				props.type == 3 ?
-				unref(dataInfo)?.pgrphId :
-				props.type == 4 ?
-				unref(dataInfo)?.qnsId :
-				props.type == 5 ?
-				unref(dataInfo)?.qnsId :
-				props.type == 8 ?
-				unref(dataInfo)?.qnsId :
-				'';
-			let _params = {
-				crsId: unref(dataInfo)?.crsId || '',
-				pgrphId: unref(dataInfo)?.pgrphId || '',
-				qnsId: unref(dataInfo)?.qnsId || '',
-				readType: _type, // 2 文本回答 3, 段落信息  4  问题信息
-				teachNo: unref(teacherInfo)?.teacherNo, // 必填
-				readId: _readId
-				// content: _content
-			};
-
-			let _url =
-				'/trastudy/traStdyInfo/readContent?' +
-				Object.keys(_params)
-				.map((t) => {
-					return encodeURIComponent(t) + '=' + encodeURIComponent(_params[t]);
-				})
-				.join('&');
-
-			storageStore.getStorageById('audio', _url + _params.teachNo, (url) => {
-				if (url) {
-					voiceLoading.value = false;
-					itemVoice.value = url;
-					talkVoiceObj.value.src = url;
+				return;
+			}
+			talkVoiceObj.value.src = '';
+			if (itemVoice.value) {
+				setTimeout(() => {
+					talkVoiceObj.value.src = itemVoice.value;
 					talkVoiceObj.value.play();
-				} else {
-					downloadVoiceFile(_url)
-						.then((res) => {
-							if (res?.data) {
-								common.msg(res.data.message);
-								return;
-							}
-							voiceLoading.value = false;
-							itemVoice.value = res.tempFilePath;
-							talkVoiceObj.value.src = res.tempFilePath;
-							talkVoiceObj.value.play();
-							storageStore.setStorage('audio', _url + _params.teachNo, itemVoice.value);
-						})
-						.catch((err) => {
-							voiceLoading.value = false;
-						});
-				}
-			});
-		}
+				}, 100);
+			} else {
+				voiceLoading.value = true;
+				let _type =
+					props.type == 2 ?
+					'ans' :
+					props.type == 3 ?
+					'pgrh' :
+					props.type == 4 ?
+					'qns' :
+					props.type == 5 ?
+					'analysis' :
+					props.type == 8 ?
+					'stemAnalysis' :
+					'';
+				let _readId =
+					props.type == 2 ?
+					unref(dataInfo)?.intrctId :
+					props.type == 3 ?
+					unref(dataInfo)?.pgrphId :
+					props.type == 4 ?
+					unref(dataInfo)?.qnsId :
+					props.type == 5 ?
+					unref(dataInfo)?.qnsId :
+					props.type == 8 ?
+					unref(dataInfo)?.qnsId :
+					'';
+				let _params = {
+					crsId: unref(dataInfo)?.crsId || '',
+					pgrphId: unref(dataInfo)?.pgrphId || '',
+					qnsId: unref(dataInfo)?.qnsId || '',
+					readType: _type, // 2 文本回答 3, 段落信息  4  问题信息
+					teachNo: unref(teacherInfo)?.teacherNo, // 必填
+					readId: _readId
+					// content: _content
+				};
+
+				let _url =
+					'/trastudy/traStdyInfo/readContent?' +
+					Object.keys(_params)
+					.map((t) => {
+						return encodeURIComponent(t) + '=' + encodeURIComponent(_params[t]);
+					})
+					.join('&');
+
+				storageStore.getStorageById('audio', _url + _params.teachNo, (url) => {
+					if (url) {
+						voiceLoading.value = false;
+						itemVoice.value = url;
+						talkVoiceObj.value.src = url;
+						talkVoiceObj.value.play();
+					} else {
+						downloadVoiceFile(_url)
+							.then((res) => {
+								if (res?.data) {
+									common.msg(res.data.message);
+									return;
+								}
+								voiceLoading.value = false;
+								itemVoice.value = res.tempFilePath;
+								talkVoiceObj.value.src = res.tempFilePath;
+								talkVoiceObj.value.play();
+								storageStore.setStorage('audio', _url + _params.teachNo, itemVoice.value);
+							})
+							.catch((err) => {
+								voiceLoading.value = false;
+							});
+					}
+				});
+			
+			}
+		}, 100);
 	};
 	const saveFile = (buffer, filePath, cb = () => {}) => {
 		let fileManager = uni.getFileSystemManager();
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 33e35d1f..b09db19c 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -295,11 +295,13 @@ const showChangeSeekModelNow = () => {
 }
 const showBgModel = ref(false)
 const showChangeBgModelNow = () => {
+	console.log(222)
   changePlayItemId()
   showBgModel.value = true
 }
 // 关闭播放状态
 const changePlayItemId = (id = '') => {
+	console.log(id,'id')
   activeVoiceTalkingItemId.value = id
   // if(activeVoiceTalkingItemId.value === id){
   // 	activeVoiceTalkingItemId.value = ''
@@ -1103,6 +1105,7 @@ const getQuestionEvalateRequest = (id, data, num) => {
           if (t.id === id) {
             lastTalkingInfo.value = {
               ..._body.chatBody,
+							crsId: crsId.value,
               pgrphId: data.pgrphId,
               qstLogId: loadingExecLogId.value,
               id,

From 008dc6b2ab961380024cd67b22428900d68a3583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Mon, 22 Sep 2025 16:09:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E5=90=8E=EF=BC=8C=E5=B7=B2=E7=BB=8F?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E5=9B=BE=E6=A0=87=E4=B8=8D=E5=A4=8D=E5=8E=9F=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development             | 2 +-
 src/pages/practice/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 7d10ff90..23e0e4f5 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 # 'development'
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue
index 5363ac0c..fb3099b6 100644
--- a/src/pages/practice/index.vue
+++ b/src/pages/practice/index.vue
@@ -307,7 +307,7 @@ const touchBtnSubmit = (type, submitObj) => {
   const topic = topicList[questionNumber.value];
   touchBtnRef.value?.clearinputText(); // 清除发送框数据
   if (type === 'voice') {
-    if (topic.es_status == '00') return;
+    if (topic.es_status === '00') return;
     topic.es_status = '00'; // 00转圈
     const voicePath = submitObj;
     commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})

From f645fe7bbb47946d2e9e7af8293b13092f54dc9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 22 Sep 2025 16:09:53 +0800
Subject: [PATCH 6/6] fix: bug

---
 src/pages/course/components/talkingItem.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 1c92653d..2ff31718 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -454,7 +454,8 @@
 						prevTime = talkVoiceObj.value.currentTime;
 					}
 				} else {
-					if (props.isPlaying && (talkVoiceObj.value.currentTime > 0) && (pauseTime !== talkVoiceObj.value.currentTime) && props.activeVoiceId) {
+					if (props.isPlaying && (talkVoiceObj.value.currentTime > 0)  && props.activeVoiceId) {
+						console.log(pauseTime , prevTime)
 						emit('changePlay', '');
 					}
 				}