From 584f2a9711d828c8d47c0103c3e919fbbe8b2b19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 16:38:03 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/sparring/result.vue | 10 ++++++++++
 src/pages/sparring/tip.vue    |  7 ++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index 5d262aa4..a466503c 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -75,6 +75,8 @@
 			</view>
 		</view>
 		<Feedback ref="feedbackRef" />
+		<badge ref="badgeRef"></badge>
+		<points ref="pointsRef"></points>
 	</view>
 </template>
 
@@ -102,6 +104,11 @@
 	import {
 		partnerChatReport
 	} from "@/api/sparring.js"
+	import badge from '@/components/points-and-badge/badge'; 
+	import points from '@/components/points-and-badge/points';
+	import usePointsAndBadge from '@/components/points-and-badge/usePointsAndBadge';
+	
+	const { pointAndBadgesRun, badgeRef, pointsRef } = usePointsAndBadge();
 	const traId = ref('')
 	const execId = ref('')
 	const talkingType = ref('')
@@ -240,6 +247,9 @@
 				isLoading.value = false
 				setTimeout(() => {
 					showLoading.value = false
+					if(isPass.value){
+						pointAndBadgesRun(isPreview.value ? '07': '08', '', ()=>{})
+					}
 				}, 800)
 			} else {
 				setTimeout(getData, 2000)
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 37784c21..601e486c 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -423,9 +423,10 @@
 					watchFlag.value = 1;
 					socketStore?.closeSocket();
 					changePlayItemId('')
-					pointAndBadgesRun(talkingType.value === '01'? '07': '08', null, ()=>{
-						common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
-					})
+					common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
+					// pointAndBadgesRun(talkingType.value === '01'? '07': '08', '', ()=>{
+					// 	common.navigateTo('/pages/sparring/result?isOver=1&traId=' + traId.value + '&execId=' + execId.value + '&type=' + talkingType.value + '&isPreview=' + (isPreview.value ?'1':''))
+					// })
 				})
 			}
 		})

From bf70e674ed94870db78a0a5c049cb682776d182f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 16:47:40 +0800
Subject: [PATCH 2/8] fix: bug

---
 src/pages/sparring/detail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/sparring/detail.vue b/src/pages/sparring/detail.vue
index 926daec2..41ed9093 100644
--- a/src/pages/sparring/detail.vue
+++ b/src/pages/sparring/detail.vue
@@ -158,11 +158,12 @@
 				background-image: url(@/static/images/sparring/top-bg.png);
 				background-repeat: no-repeat;
 				background-size: cover;
-				height: 436rpx;
-				clip-path: ellipse(650rpx 327rpx at 375rpx 109rpx);
+				height: calc(var(--status-bar-height) + 436rpx);
+				clip-path: ellipse(650rpx 327rpx at 375rpx calc(var(--status-bar-height) + 109rpx));
 				width: 100%;
 				position: fixed;
-				top: var(--status-bar-height);
+				padding-top: var(--status-bar-height);
+				top: 0;
 				left: 0;
 				z-index: 2;
 

From e0281077666694f0aa4b57901a22211127c2df24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 17:35:53 +0800
Subject: [PATCH 3/8] fix: bug

---
 src/pages/sparring/result.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index a466503c..d031a32d 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -248,7 +248,7 @@
 				setTimeout(() => {
 					showLoading.value = false
 					if(isPass.value){
-						pointAndBadgesRun(isPreview.value ? '07': '08', '', ()=>{})
+						pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{})
 					}
 				}, 800)
 			} else {

From dd6bf479c9e1ab043e2694e123faed002b141461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 18:39:21 +0800
Subject: [PATCH 4/8] fix: bug

---
 src/pages/sparring/result.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index d031a32d..8c4e0710 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -203,7 +203,7 @@
 			if (res.body.reportFlag){
 				traInfo.value = res.body.traPartnerInfo || {}
 				roleInfo.value = res.body.traPartnerCharacterInfoVo || {}
-				traTm.value = res.body.traTm || '0'
+				traTm.value = res.body.traTmFmtHMS  || '0'
 				isPass.value = res.body.traPartnerExecuteHisVo?.traResult === 'P'
 				totalScore.value = res.body.traPartnerExecuteHisVo?.traGrade || '0'
 				positiveList.value = res.body.positiveList || []

From 13f235c3d25c1467a044763260e7f5e8b3f00924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 19:15:55 +0800
Subject: [PATCH 5/8] fix: bug

---
 src/pages/sparring/components/answer.vue      |  4 +-
 .../sparring/components/question-preview.vue  | 71 +++++++++++++++----
 src/pages/sparring/tip.vue                    |  2 +-
 3 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/pages/sparring/components/answer.vue b/src/pages/sparring/components/answer.vue
index 52a6db88..735ac401 100644
--- a/src/pages/sparring/components/answer.vue
+++ b/src/pages/sparring/components/answer.vue
@@ -180,7 +180,7 @@
 						return encodeURIComponent(t) + '=' + encodeURIComponent(_params[t]);
 					})
 					.join('&');
-				storageStore.getStorageById('audio', _url + _params.teachNo, (url) => {
+				storageStore.getStorageById('audio', _url + _params.execLogId, (url) => {
 					if (url) {
 						voiceLoading.value = false;
 						itemVoice.value = url;
@@ -201,7 +201,7 @@
 								if (voiceIsPlaying.value) return
 								if(unref(dataInfo)?.id !== props.activeVoiceId) return
 								talkVoiceObj.value.play();
-								storageStore.setStorage('audio', _url + _params.teachNo, itemVoice.value);
+								storageStore.setStorage('audio', _url + _params.execLogId, itemVoice.value);
 							})
 							.catch((err) => {
 								voiceLoading.value = false;
diff --git a/src/pages/sparring/components/question-preview.vue b/src/pages/sparring/components/question-preview.vue
index 37163a26..423dc685 100644
--- a/src/pages/sparring/components/question-preview.vue
+++ b/src/pages/sparring/components/question-preview.vue
@@ -46,6 +46,15 @@
 <script setup>
 import { computed, unref, ref, toRefs, watch, onMounted } from "vue"
 import { onUnload } from '@dcloudio/uni-app';
+	import {
+		useStorageStore
+	} from '@/store/storage.js';
+	import {
+		downloadFile,
+		downloadVoiceFile
+	} from '@/api/common.js'
+
+	const storageStore = useStorageStore();
  	const props = defineProps({
 		dataInfo: {
 			default: () => ({}),
@@ -84,21 +93,53 @@ import { onUnload } from '@dcloudio/uni-app';
 	}
 	const playVoice = () =>{
 		emit('changePlay', unref(dataInfo)?.id)
-		if(talkVoiceObj.value && talkVoiceObj.value.src) {
-			setTimeout(()=>{
-				talkVoiceObj.value.src = unref(dataInfo).talkingVoice
-				talkVoiceObj.value.play()
-			},300)
-			return
-		}else{
-			talkVoiceObj.value.src = ''
-			if(unref(dataInfo).talkingVoice){
-				setTimeout(()=>{
-					talkVoiceObj.value.src = unref(dataInfo).talkingVoice
-					talkVoiceObj.value.play()
-					isPlaying.value = true
-				},100)
-			}
+		
+		if (talkVoiceObj.value.src && talkVoiceObj.value.src === itemVoice.value) {
+			if (voiceIsPlaying.value) return
+			talkVoiceObj.value.play();
+			voiceLoading.value = false;
+			return;
+		}
+			talkVoiceObj.value.src = '';
+		if (itemVoice.value) {
+			setTimeout(() => {
+				talkVoiceObj.value.src = itemVoice.value;
+				if (voiceIsPlaying.value) return
+				if(unref(dataInfo)?.id !== props.activeVoiceId) return
+				talkVoiceObj.value.play();
+			}, 100);
+		} else {
+			voiceLoading.value = true;
+			let _id =  unref(dataInfo)?.fileId
+			storageStore.getStorageById('audio', _id, (url) => {
+				if (url) {
+					voiceLoading.value = false;
+					itemVoice.value = url;
+					talkVoiceObj.value.src = url;
+					if (voiceIsPlaying.value) return
+					if(unref(dataInfo)?.id !== props.activeVoiceId) return
+					talkVoiceObj.value.play();
+				} else {
+					downloadFile(_id)
+						.then((res) => {
+							if (res?.data) {
+								common.msg(res.data.message);
+								return;
+							}
+							voiceLoading.value = false;
+							itemVoice.value = res.tempFilePath;
+							talkVoiceObj.value.src = res.tempFilePath;
+							if (voiceIsPlaying.value) return
+							if(unref(dataInfo)?.id !== props.activeVoiceId) return
+							talkVoiceObj.value.play();
+							storageStore.setStorage('audio', _id, itemVoice.value);
+						})
+						.catch((err) => {
+							voiceLoading.value = false;
+							emit('changePlay', '');
+						});
+				}
+			});
 		}
 	}
 	const initVoice = () => {
diff --git a/src/pages/sparring/tip.vue b/src/pages/sparring/tip.vue
index 601e486c..bad487f2 100644
--- a/src/pages/sparring/tip.vue
+++ b/src/pages/sparring/tip.vue
@@ -199,7 +199,7 @@
 						execId: execId.value,
 						intrctWay: '02', //01-文本；02-语音；03-图片
 						intrctContent: _res.body.transContent,
-						bucketKey: _res.body.fileId,
+						fileId: _res.body.fileId,
 						ossFileAddr: _res.body.ossFileAddr,
 						talkingVoice: voicePath
 					};

From 32da83da3b1fc54d3bc26e135c6b545bf2a7f729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 25 Nov 2025 19:34:25 +0800
Subject: [PATCH 6/8] fix: bug

---
 src/pages/sparring/result.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index 8c4e0710..69f17724 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -247,7 +247,7 @@
 				isLoading.value = false
 				setTimeout(() => {
 					showLoading.value = false
-					if(isPass.value){
+					if(isPass.value && isOver.value){
 						pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{})
 					}
 				}, 800)

From f975feaf527fee38e62f8d31ea82d928c64b8eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 26 Nov 2025 08:06:03 +0800
Subject: [PATCH 7/8] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/sparring/components/question-preview.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/sparring/components/question-preview.vue b/src/pages/sparring/components/question-preview.vue
index 423dc685..42657bb4 100644
--- a/src/pages/sparring/components/question-preview.vue
+++ b/src/pages/sparring/components/question-preview.vue
@@ -91,6 +91,7 @@ import { onUnload } from '@dcloudio/uni-app';
 		isPlaying.value = false
 		emit('changePlay', '')
 	}
+	const voiceIsPlaying = ref(false)
 	const playVoice = () =>{
 		emit('changePlay', unref(dataInfo)?.id)
 		
@@ -147,17 +148,20 @@ import { onUnload } from '@dcloudio/uni-app';
 		talkVoiceObj.value.onPause(()=>{
 		})
 		talkVoiceObj.value.onPlay(()=>{
+			voiceIsPlaying.value = true
 			if(isTesting.value){
 				talkVoiceObj.value.pause()
-			isTesting.value = false
+				isTesting.value = false
 			}
 		})
 		talkVoiceObj.value.onEnded(()=>{
 			emit('changePlay', '')
 			talkVoiceObj.value.src = ''
+			voiceIsPlaying.value = false
 		})
 		talkVoiceObj.value.onError(()=>{
 			talkVoiceObj.value.src = ''
+			voiceIsPlaying.value = false
 		})
 	}
 	const isTesting= ref(false)

From 0f38cec97996ac013d4d8fc7abba75f5478c654d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 26 Nov 2025 08:55:55 +0800
Subject: [PATCH 8/8] fix: bug

---
 .env.development                                  |  4 ++--
 src/pages/sparring/components/answer.vue          |  2 +-
 .../sparring/components/question-preview.vue      | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index d25025e0..03c62d3e 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
@@ -14,7 +14,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
 # VITE_APP_BASE_API_Url = 'http://192.168.108.129'
 # dev
-VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # sit
 # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
 # UAT
diff --git a/src/pages/sparring/components/answer.vue b/src/pages/sparring/components/answer.vue
index 735ac401..c9ee8049 100644
--- a/src/pages/sparring/components/answer.vue
+++ b/src/pages/sparring/components/answer.vue
@@ -150,8 +150,8 @@
 			return;
 		}
 		isPlaying.value = true
+		emit('changePlay', unref(dataInfo)?.id);
 		setTimeout(() => {
-			emit('changePlay', unref(dataInfo)?.id);
 			// readType 阅读内容类型pgrh段落/qns问题
 			if (talkVoiceObj.value.src && talkVoiceObj.value.src === itemVoice.value) {
 				if (voiceIsPlaying.value) return
diff --git a/src/pages/sparring/components/question-preview.vue b/src/pages/sparring/components/question-preview.vue
index 42657bb4..e340391c 100644
--- a/src/pages/sparring/components/question-preview.vue
+++ b/src/pages/sparring/components/question-preview.vue
@@ -166,6 +166,21 @@ import { onUnload } from '@dcloudio/uni-app';
 	}
 	const isTesting= ref(false)
 	watch(() => props.dataInfo, () => {},{deep: true,immediate: true})
+	watch(
+		() => props.activeVoiceId,
+		(val) => {
+			if (val !== props.dataInfo.id) {
+				if (voiceIsPlaying.value) {
+					voiceIsPlaying.value = false
+					if (!talkVoiceObj.value) return
+					talkVoiceObj.value.pause()
+				}
+			}
+		}, {
+			deep: true,
+			immediate: true
+		}
+	)
 </script>
 
 <style scoped lang="scss">