From ad2a9449bd985631e81f611fc6b4d5f340d33881 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 09:09:53 +0800
Subject: [PATCH 1/7] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/components/talkingItem.vue | 14 ++---
 src/pages/course/study.vue                  | 59 ++++++++++++---------
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index f723dec9..a77c9905 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -65,7 +65,7 @@
 		<view class="user-info">
 			<view class="avatar-box">
 				<!-- <ImagePreview class="img-box" :imgId="''"></ImagePreview> -->
-				<img class="img-box" :src="userInfo.imageAddr" alt="" fit="contain" style="width: 100%; height: 100%;"/>
+				<img class="img-box" :src="userInfo.imagePath" alt="" fit="contain" style="width: 100%; height: 100%;"/>
 			</view>
 			<view class="ai-name">
 				{{ userInfo.userName }}
@@ -97,7 +97,7 @@
 						style="width: 100%;height: 100%;"
 					></image>
 				</view>
-				<view class="icon text-btn" @click="translateVoice(item)">文</view>
+				<view class="icon text-btn" v-if="type === 1" @click="translateVoice(item)">文</view>
 				<view class="icon text-right-btn" @click="translateVoice(item)">完成</view>
 				<view class="icon text-right-btn" @click="translateVoice(item)">撤回</view>
 			</view>
@@ -107,7 +107,7 @@
 		<view class="user-info">
 			<view class="avatar-box">
 				<!-- <ImagePreview class="img-box" :imgId="''"></ImagePreview> -->
-				<img class="img-box" :src="userInfo.imageAddr" alt="" fit="contain" style="width: 100%; height: 100%;"/>
+				<img class="img-box" :src="userInfo.imagePath" alt="" fit="contain" style="width: 100%; height: 100%;"/>
 			</view>
 			<view class="ai-name">
 				{{ userInfo.userName }}
@@ -148,6 +148,7 @@ import { getUserInfo } from '@/common/common';
 	})
 	const { type, dataInfo, activeVoiceId } = toRefs(props)
 	const emit = defineEmits(['changePlay', 'nextQuestion'])
+	// 声音播放初始化
 	const talkVoiceObj = uni.createInnerAudioContext()
 	const userInfo = computed(() => getUserInfo())
 	watch(() => props.activeVoiceId,(val) => {
@@ -160,7 +161,6 @@ import { getUserInfo } from '@/common/common';
 	})
 	
 	talkVoiceObj.onEnded(()=>{
-		// talkVoiceObj.src = ''
 		emit('changePlay',unref(dataInfo)?.id)
 	})
 	talkVoiceObj.onError(()=>{
@@ -171,8 +171,8 @@ import { getUserInfo } from '@/common/common';
 		talkVoiceObj.pause()
 		emit('changePlay',unref(dataInfo)?.id)
 	}
+	// 重播
 	const restartPlay = () => {
-		console.log(userInfo)
 		if(talkVoiceObj.src){
 			talkVoiceObj.seek(0)
 			talkVoiceObj.play()
@@ -205,7 +205,9 @@ import { getUserInfo } from '@/common/common';
 		}
 	}
 	const playQnsVoice = (readType = 'qns', item) =>{
-		if(item.type === 2){
+		console.log(unref(dataInfo))
+		if(type.value === 2){
+			// 录音
 			playVoice(readType)
 			return
 		}
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 0a5b2e8d..28585253 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -37,7 +37,7 @@
 				<uv-icon class="arrow-icon" name="arrow-left" @click="common.navigateBack()"/>
 				课程学习
 			</view>
-			<view class="talking-list">
+			<view class="talking-list" id="scroll-box" ref="scrollBoxRef">
 				<view class="study-num">
 					<view class="color-blue">{{ showOrder }}</view> / {{ pgrphNum }}
 				</view>
@@ -95,7 +95,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, computed, unref, onMounted, onUnmounted, getCurrentInstance } from 'vue';
+import { reactive, ref, computed, unref, onMounted, onUnmounted, getCurrentInstance, nextTick } from 'vue';
 import { onLoad,onShow,onHide } from '@dcloudio/uni-app';
 import { 
 	previewFile, 
@@ -139,7 +139,6 @@ const inputRef = ref('')
 const getData = async () => {
 	try{
 		const { body } = await getCourseStudyInfoApi({crsId: crsId.value})
-			console.log(3)
 		initsocketTask()
 		if(body.stdyProgressFlag === 'N'){
 			step.value = 1
@@ -149,14 +148,11 @@ const getData = async () => {
 				voiceObj: null
 			}))
 		}else{
-			console.log(2)
 			common.show('提示信息', '此门课程已有学习历史，请选择是否继续学习？',true, '重新开始','继续学习').then((res) => {
-				console.log(res)
 				if(res) {
 					// 继续学习 ， 获取学习历史接口
 					// 滚动到最下面
 					scrollToBottomNow()
-					
 					choiceTeacher.value = body.choiceTeacher
 					sendMessage({
 						"commond" : 'STDY',
@@ -210,7 +206,7 @@ const choiceTeacherInfo = computed(()=>{
 	return teacherList.value.find(t=> t.teacherNo === choiceTeacher.value)
 }) 
 const keyboardIsShow = ref(false)
-
+// 发送文本
 const showKeyboard = () => {
 	if(keyboardIsShow.value){
 		if(answerValue.value){
@@ -227,9 +223,11 @@ const showKeyboard = () => {
 					talkingList.value.push({
 						crsId: crsId.value,
 						pgrphId: unref(lastTalkingInfo).pgrphId,
+						qnsId: unref(lastTalkingInfo).qnsId,
 						talkingContent: answerValue.value,
 						talkingVoice: '',
 						type: 2,
+						userInfo: {...choiceTeacherInfo.value},
 						id: _id
 					})
 					scrollToBottomNow()
@@ -292,13 +290,13 @@ const nextStep = () => {
 
 const pgrphNum = ref(1)
 const showOrder = ref(0)
+// 获取段落
 const getGraphInfoUnStudy = () => {
 	queryTraStdyBatchWaitParagraphInfoApi({
 		crsId: crsId.value,
 		stdyId: unref(stdyId),
 		stdyBatch: unref(stdyBatch)
 	}).then(res=>{
-		console.log(res)
 		let _id = new Date().getTime() + 'id'
 		lastTalkingInfo.value = {
 			...res.body,
@@ -322,7 +320,6 @@ const getQuestionInfoUnStudy = (pgrphId) => {
 		stdyBatch: unref(stdyBatch),
 		pgrphId
 	}).then(res=>{
-		console.log(res)
 		let _id = new Date().getTime() + 'id'
 		lastTalkingInfo.value = {
 			...res.body,
@@ -349,15 +346,23 @@ const nextQuestionSuccess = (info) => {
 	// getGraphInfoUnStudy()
 	getQuestionInfoUnStudy(info.pgrphId)
 }
+const scrollBoxRef = ref()
 const scrollToBottomNow = () => {
-	let _arr =  talkingList.value || []
-	if(_arr.length && _arr.length > 0){
-		let _last = talkingList.value[talkingList.value.length - 1]
-		uni.pageScrollTo({
-			selector: '#item' + _last.id,
-			duration: 300
+	setTimeout(() => {
+		// let scrollElem = scrollBoxRef.value.$el
+		let scrollElem = document.getElementById('scroll-box')
+		scrollElem.scrollTo({
+			top: scrollElem.scrollHeight, behavior: 'smooth'
 		})
-	}
+		// let _arr =  talkingList.value || []
+		// if(_arr.length && _arr.length > 0){
+		// 	let _last = talkingList.value[talkingList.value.length - 1]
+		// 	uni.pageScrollTo({
+		// 		selector: '#item' + _last.id,
+		// 		duration: 300
+		// 	})
+		// }
+	},200)
 } 
 
 const reconnectTimer = null // 重连timer
@@ -365,7 +370,7 @@ const isManualClose = ref(false) // 是否手动关闭
 
 const stdyId = ref('')
 const stdyBatch = ref('')
-
+// ws 初始化逻辑
 const initsocketTask = () => {
 	socketStore.creatSocket()
 	unref(SocketObj).on('message', (res)=>{
@@ -400,6 +405,7 @@ const closeWebSocket = () => {
 		uni.closeSocket({})
 	}
 }
+// ws 结束
 
 onLoad((params) => {
 	crsId.value = params.crsId||'';
@@ -429,20 +435,20 @@ const recordObj = {}
 const initRecord = () => {}
 // #endif
 onMounted(()=>{
-	// getData();
+	getData();
 	initRecord?.()
 })
 onShow(()=>{
-	getData();
+	// getData();
 })
-onHide(()=>{ 
-	closeWebSocket()
+// onHide(()=>{ 
+// 	teacherVoiceObj.stop()
+// 	teacherVoiceObj.src = ''
+// })
+onUnmounted(()=>{
 	teacherVoiceObj.stop()
 	teacherVoiceObj.src = ''
 })
-// onUnmounted(()=>{
-// 	closeWebSocket()
-// })
 const playRecord = () => {
 	audioObj.src = audioPath.value
 	unref(audioObj).play()
@@ -490,24 +496,27 @@ const hideOverlayTalking = (obj) => {
 				talkingList.value.push({
 					crsId: crsId.value,
 					pgrphId: unref(lastTalkingInfo).pgrphId,
+					qnsId: unref(lastTalkingInfo).qnsId,
 					talkingContent: '',
 					talkingVoice: audioPath.value,
 					type: 1,
+					userInfo: {...choiceTeacherInfo.value},
 					id: _id
 				})
 			// #endif
 			//#ifdef APP-PLUS
 			commonUploadVoiceFile(audioPath.value, '/trastudy/traStdyInfo/studyAnswerVoiceUp', _data).then(res=>{
-				console.log(JSON.parse(res.data))
 				let _res = JSON.parse(res.data)
 				if(_res.rtnCode === '0000'){
 					let _id = new Date().getTime() + 'id'
 					talkingList.value.push({
 						crsId: crsId.value,
 						pgrphId: unref(lastTalkingInfo).pgrphId,
+						qnsId: unref(lastTalkingInfo).qnsId,
 						talkingContent: '',
 						talkingVoice: audioPath.value,
 						type: 1,
+						userInfo: {...choiceTeacherInfo.value},
 						id: _id
 					})
 					scrollToBottomNow()

From 1d1288539e74ea8a3f275e8afee57555dff31833 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 14:42:57 +0800
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E6=89=93=E5=8C=85=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.js                           |  23 +++++-
 src/main.js                                 |   2 +-
 src/pages/course/components/talkingItem.vue |  78 +++++++++++---------
 src/pages/course/study.vue                  |  64 ++++++++++------
 src/static/images/course/voice-white.gif    | Bin 0 -> 2320 bytes
 src/store/socket.js                         |   8 +-
 6 files changed, 113 insertions(+), 62 deletions(-)
 create mode 100644 src/static/images/course/voice-white.gif

diff --git a/src/api/common.js b/src/api/common.js
index 46f6f350..9897be59 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -79,7 +79,17 @@ export const commonUploadVoiceFile = (file, url, data = {}, fileKey='voice') =>
 			name: fileKey, 
 			formData: data,
 			success(result) { 
-				resolve(result)
+				try {  
+					const res = JSON.parse(result.data);  
+					console.log(res)
+					if (res.rtnCode === '0000') {  
+						resolve(result);  
+					} else {  
+						reject(new Error(res.message));  
+					}  
+				} catch (error) {  
+					reject(new Error('Failed to parse response'));  
+				}  
 			},  
 			fail(error) {    
 				reject(new Error('Upload failed'));  
@@ -104,7 +114,16 @@ export const uploadVoiceFile = (file) => {
 			filePath: file,  
 			name: 'voice',  
 			success(result) { 
-				resolve(result)
+				try {  
+					const res = JSON.parse(result.data);  
+					if (res.rtnCode === '0000') {  
+						resolve(result);  
+					} else {  
+						reject(new Error(res.message));  
+					}  
+				} catch (error) {  
+					reject(new Error('Failed to parse response'));  
+				}  
 			},  
 			fail(error) {    
 				reject(new Error('Upload failed'));  
diff --git a/src/main.js b/src/main.js
index e314a512..4666ee1c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
 import App from './App'
 import { createSSRApp } from 'vue'
-import pinia from './store'
+import pinia from './store/index.js'
 
 export function createApp() {
   const app = createSSRApp(App)
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index a77c9905..7726f5fe 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -85,7 +85,7 @@
 				</view> -->
 				<view class="play-btn">
 					<image class="icon" 
-						@click="playQnsVoice('qns', item)"
+						@click="playQnsVoice('qns', dataInfo)"
 						v-show="props.activeVoiceId !== dataInfo.id"
 						src="@/static/images/course/play-blue.png" 
 						style="width: 100%;height: 100%;"
@@ -97,9 +97,9 @@
 						style="width: 100%;height: 100%;"
 					></image>
 				</view>
-				<view class="icon text-btn" v-if="type === 1" @click="translateVoice(item)">文</view>
-				<view class="icon text-right-btn" @click="translateVoice(item)">完成</view>
-				<view class="icon text-right-btn" @click="translateVoice(item)">撤回</view>
+				<view class="icon text-btn" v-if="type === 1" @click="translateVoice(dataInfo)">文</view>
+				<view class="icon text-right-btn" @click="translateVoice(dataInfo)" v-if="isLast">完成</view>
+				<view class="icon text-right-btn" @click="translateVoice(dataInfo)">撤回</view>
 			</view>
 		</view>
 	</view>
@@ -123,10 +123,10 @@
 </template>
 
 <script setup>
-import { watch, unref, ref, toRefs, computed } from 'vue'
+import { watch, unref, ref, toRefs, computed, nextTick } from 'vue'
 import ImagePreview from '@/components/image-preview/image-preview.vue'
 import VideoPreview from '@/components/image-preview/video-preview.vue'
-import { downloadVoiceFile } from "@/api/common.js"
+import { downloadVoiceFile, uploadVoiceFile, } from "@/api/common.js"
 import { studyParagraphOverApi } from "@/api/study.js"
 import ChartFour from "./chartFour.vue"
 import ChartThree from "./chartThree.vue"
@@ -144,48 +144,60 @@ import { getUserInfo } from '@/common/common';
 		activeVoiceId:{
 			default:'',
 			type: String
+		},
+		isLast:{
+			default:false,
+			type: Boolean
 		}
 	})
 	const { type, dataInfo, activeVoiceId } = toRefs(props)
 	const emit = defineEmits(['changePlay', 'nextQuestion'])
 	// 声音播放初始化
-	const talkVoiceObj = uni.createInnerAudioContext()
+	const talkVoiceObj = ref(uni.createInnerAudioContext())
 	const userInfo = computed(() => getUserInfo())
 	watch(() => props.activeVoiceId,(val) => {
 		if(val && (val !== unref(dataInfo).id)){
-			talkVoiceObj?.stop()
+			talkVoiceObj.value?.stop()
 		}
 	},{
 		deep: true,
 		immediate: true
 	})
 	
-	talkVoiceObj.onEnded(()=>{
-		emit('changePlay',unref(dataInfo)?.id)
+	talkVoiceObj.value.onEnded(()=>{
+		emit('changePlay', '')
+		talkVoiceObj.value.src = ''
 	})
-	talkVoiceObj.onError(()=>{
-		emit('changePlay',unref(dataInfo)?.id)
+	talkVoiceObj.value.onError(()=>{
+		emit('changePlay', '')
+		talkVoiceObj.value.src = ''
 	})
 	const pauseVoice = () => {
-		if(!talkVoiceObj) return
-		talkVoiceObj.pause()
-		emit('changePlay',unref(dataInfo)?.id)
+		if(!talkVoiceObj.value) return
+		talkVoiceObj.value.pause()
+		emit('changePlay', '')
 	}
 	// 重播
 	const restartPlay = () => {
-		if(talkVoiceObj.src){
-			talkVoiceObj.seek(0)
-			talkVoiceObj.play()
+		emit('changePlay', unref(dataInfo)?.id)
+		if(itemVoice.value){
+			setTimeout(()=>{
+				talkVoiceObj.value.src = itemVoice.value
+				talkVoiceObj.value.play()
+			},100)
 		}else{
 			playVoice()
 		}
 	}
-		
+	const itemVoice = ref('')
 	const playVoice = (readType = 'pgth') =>{
 		// readType 阅读内容类型pgrh段落/qns问题
 		emit('changePlay', unref(dataInfo)?.id)
-		if(talkVoiceObj.src){
-			talkVoiceObj.play()
+		if(itemVoice.value){
+			setTimeout(()=>{
+				talkVoiceObj.value.src = itemVoice.value
+				talkVoiceObj.value.play()
+			},100)
 		}else{
 			let _params = {
 				crsId: unref(dataInfo)?.crsId || '',
@@ -193,34 +205,34 @@ import { getUserInfo } from '@/common/common';
 				qnsId: unref(dataInfo)?.qnsId || '',
 				readType: readType,
 				teachNo: unref(dataInfo)?.userInfo?.teacherNo, // 必填
-				content: unref(dataInfo)?.pgrphContent || unref(dataInfo)?.talkingContent,
+				content: unref(dataInfo)?.pgrphContent || unref(dataInfo)?.qnsContent || unref(dataInfo)?.talkingContent,
 			}
 			let _url = '/trastudy/traStdyInfo/readContent?' + Object.keys(_params).map(t=>{
 				return encodeURIComponent(t) + '=' + encodeURIComponent(_params[t])
 			}).join('&')
 			downloadVoiceFile(_url).then(res=>{
-				talkVoiceObj.src = res.tempFilePath
-				talkVoiceObj.play()
+				itemVoice.value = res.tempFilePath
+				talkVoiceObj.value.src = res.tempFilePath
+				talkVoiceObj.value.play()
 			})
 		}
 	}
 	const playQnsVoice = (readType = 'qns', item) =>{
-		console.log(unref(dataInfo))
 		if(type.value === 2){
-			// 录音
+			// 文本转语音
 			playVoice(readType)
 			return
 		}
 		// readType 阅读内容类型pgrh段落/qns问题
 		emit('changePlay', unref(dataInfo)?.id)
-		if(talkVoiceObj.src){
-			talkVoiceObj.play()
-		}else{
-			talkVoiceObj.src = item.talkingVoice
-			talkVoiceObj.play()
-		}
+		setTimeout(()=>{
+			itemVoice.value = item.talkingVoice
+			talkVoiceObj.value.src = item.talkingVoice
+			talkVoiceObj.value.play()
+		},100)
 	}
 	const translateVoice = (item) =>{
+		if(!item.talkingVoice) return
 		uploadVoiceFile(item.talkingVoice,{}).then(res=>{
 			let _data = JSON.parse(res.data)
 			item.talkingContent = _data.body
@@ -451,7 +463,7 @@ import { getUserInfo } from '@/common/common';
 				background-size: 100%;
 				margin-bottom: 16rpx;
 				&.is-play{
-					background: url(@/static/images/course/voice-gif.gif) no-repeat;
+					background: url(@/static/images/course/voice-white.gif) no-repeat;
 					background-size: 100%;
 				}
 			}
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 28585253..f38c9e9f 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -33,26 +33,30 @@
 			</view>
 		</view>
 		<view class="course-study-body" v-show="step === 2" @click="playRecord">
-			<view class="body-title">
+			<view class="body-title" @click="scrollToBottomNow">
 				<uv-icon class="arrow-icon" name="arrow-left" @click="common.navigateBack()"/>
 				课程学习
 			</view>
-			<view class="talking-list" id="scroll-box" ref="scrollBoxRef">
+			<scroll-view class="talking-list" :scroll-y="true">
+			<!-- <view class="talking-list-cont" id="scroll-box" ref="scrollBoxRef"> -->
 				<view class="study-num">
 					<view class="color-blue">{{ showOrder }}</view> / {{ pgrphNum }}
 				</view>
 				<TalkingItem 
 					class="talking-item" 
-					v-for="item in talkingList" 
+					v-for="item,index in talkingList" 
+					:key="'item' + item.id"
 					:type="item.type" 
 					:dataInfo="item"
 					:activeVoiceId="activeVoiceTalkingItemId"
 					@changePlay="changePlayItemId"
 					@nextQuestion="nextQuestionSuccess"
 					:id="'item' + item.id"
+					:isLast="talkingList.length === (index+1)"
 				></TalkingItem>
 			<!-- <video v-if="videoUrlShow" :src="videoUrlShow" controls></video> -->
-			</view>
+			<!-- </view> -->
+			</scroll-view>
 			<view class="talk-btns">
 				<view 
 					class="touch-btn" 
@@ -348,21 +352,24 @@ const nextQuestionSuccess = (info) => {
 }
 const scrollBoxRef = ref()
 const scrollToBottomNow = () => {
-	setTimeout(() => {
-		// let scrollElem = scrollBoxRef.value.$el
-		let scrollElem = document.getElementById('scroll-box')
-		scrollElem.scrollTo({
-			top: scrollElem.scrollHeight, behavior: 'smooth'
-		})
-		// let _arr =  talkingList.value || []
-		// if(_arr.length && _arr.length > 0){
-		// 	let _last = talkingList.value[talkingList.value.length - 1]
-		// 	uni.pageScrollTo({
-		// 		selector: '#item' + _last.id,
-		// 		duration: 300
-		// 	})
-		// }
-	},200)
+	nextTick(()=>{
+		setTimeout(() => {
+			// let scrollElem = scrollBoxRef.value.$el
+			// // let scrollElem = document.getElementById('scroll-box')
+			// scrollElem.scrollTo({
+			// 	top: scrollElem.scrollHeight, behavior: 'smooth'
+			// })
+			let _arr =  talkingList.value || []
+			if(_arr.length && _arr.length > 0){
+				let _last = talkingList.value[talkingList.value.length - 1]
+				console.log('#item' + _last.id)
+				uni.pageScrollTo({
+					selector: '#item' + _last.id,
+					duration: 300
+				})
+			}
+		},200)
+	})
 } 
 
 const reconnectTimer = null // 重连timer
@@ -427,7 +434,7 @@ const startRecord = () => {
 	unref(recordObj).start({format:'mp3'})
 }
 const stopRecord = () => {
-	unref(recordObj).stop()
+	unref(recordObj)?.stop?.()
 }
 // #endif
 //#ifndef APP-PLUS
@@ -446,7 +453,7 @@ onShow(()=>{
 // 	teacherVoiceObj.src = ''
 // })
 onUnmounted(()=>{
-	teacherVoiceObj.stop()
+	teacherVoiceObj?.stop?.()
 	teacherVoiceObj.src = ''
 })
 const playRecord = () => {
@@ -481,7 +488,7 @@ const hideOverlayTalking = (obj) => {
 	stopRecord()
 	// #endif
 	if(!isOut.value){
-		// audioPath.value /traStdyInfo/studyAnswerVoiceUp
+				console.log(11111111111111)
 		setTimeout(()=>{
 			let _data = {
 				qnsId: unref(lastTalkingInfo).qnsId,// 问题ID 必输项:true  类型:String
@@ -505,7 +512,9 @@ const hideOverlayTalking = (obj) => {
 				})
 			// #endif
 			//#ifdef APP-PLUS
+				console.log(222)
 			commonUploadVoiceFile(audioPath.value, '/trastudy/traStdyInfo/studyAnswerVoiceUp', _data).then(res=>{
+				console.log(res.data)
 				let _res = JSON.parse(res.data)
 				if(_res.rtnCode === '0000'){
 					let _id = new Date().getTime() + 'id'
@@ -521,6 +530,12 @@ const hideOverlayTalking = (obj) => {
 					})
 					scrollToBottomNow()
 				}
+			}).catch(err=>{
+				uni.showToast({
+					title: err||'系统异常，请联系管理员',
+					icon: "none",
+					duration:1000
+				});
 			})
 			// #endif
 		},1000)
@@ -585,6 +600,11 @@ const handleMove = (obj) => {
 				background: url(@/static/images/course/study-bg.png) no-repeat;
 				background-size: cover;
 				border-radius: 30rpx 30rpx 0 0;
+				box-sizing: border-box;
+				width: 100%;
+				.talking-list-cont{
+					padding: 0;
+				}
 				.study-num{
 					height: 36rpx;
 					line-height: 36rpx;
diff --git a/src/static/images/course/voice-white.gif b/src/static/images/course/voice-white.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6010ae1b6645f3aa2a1e9f634837170ad8ef1e40
GIT binary patch
literal 2320
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
J{(d-S{{oLTe6Iii

literal 0
HcmV?d00001

diff --git a/src/store/socket.js b/src/store/socket.js
index c010be6e..2fe21721 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -19,11 +19,11 @@ export const useSocketStore = defineStore('socketStore',{
 			if(this.SocketObj && this.SocketObj?.close)  return
 			this.SocketObj = new SocketClass(_baseUrl + '/trastudy/trasoket/open?summary=' + getToken());
 		},
-		closeSocket: () => {
-			if(!this.SocketObj || !this.SocketObj?.close) return
-			this.SocketObj && this.SocketObj?.close?.()
+		closeSocket() {
+			if(!(this.SocketObj && this.SocketObj?.close)) return
+			this.SocketObj && this.SocketObj.close()
 		},
-		setOnmessageCb: (cb) => {
+		setOnmessageCb(cb){
 			if(!this.SocketObj || !this.SocketObj?.on) return
 			this.SocketObj.on('message', cb)
 		}

From 05d894f6886bb45fbceff8c2eb705ade8ffe6323 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 14:51:56 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9D=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index 4666ee1c..53938589 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
 import App from './App'
 import { createSSRApp } from 'vue'
-import pinia from './store/index.js'
+import pinia from '@/store/index.js'
 
 export function createApp() {
   const app = createSSRApp(App)

From ba83fad1b23beaa21c15fda7f0d9b8115df5b573 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 14:55:31 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                      | 2 +-
 src/{store/index.js => store.js} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/{store/index.js => store.js} (65%)

diff --git a/src/main.js b/src/main.js
index 53938589..f985b87a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
 import App from './App'
 import { createSSRApp } from 'vue'
-import pinia from '@/store/index.js'
+import pinia from './store.js'
 
 export function createApp() {
   const app = createSSRApp(App)
diff --git a/src/store/index.js b/src/store.js
similarity index 65%
rename from src/store/index.js
rename to src/store.js
index 11969a4c..23cb5271 100644
--- a/src/store/index.js
+++ b/src/store.js
@@ -1,3 +1,3 @@
  import { createPinia } from 'pinia';
- const store = createPinia();;
+ const store = createPinia();
  export default store;
\ No newline at end of file

From 1f9b7091ac301a36e7c41daf27963d3b477529ee Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 14:58:53 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=94=81=E5=AE=9Apinia=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 751bb3ad..e50b39a7 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
     "crypto-js": "^3.1.9-1",
-    "pinia": "^3.0.3",
+    "pinia": "3.0.3",
     "terser": "^5.42.0",
     "uuid": "^11.1.0",
     "vue": "^3.5.11",

From fee07ada90130fbdf744a689fbf3f74301845693 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 15:59:50 +0800
Subject: [PATCH 6/7] =?UTF-8?q?pinia=20=E7=89=88=E6=9C=AC=E9=99=8D?=
 =?UTF-8?q?=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                           | 151 +++++---------------
 package.json                                |   2 +-
 src/pages/course/components/talkingItem.vue |  20 +--
 src/pages/course/study.vue                  |   5 +-
 4 files changed, 48 insertions(+), 130 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 42154f12..0dae3420 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
         "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
         "crypto-js": "^3.1.9-1",
-        "pinia": "^3.0.3",
+        "pinia": "^2.3.1",
         "terser": "^5.42.0",
         "uuid": "^11.1.0",
         "vue": "^3.5.11",
@@ -4696,30 +4696,6 @@
       "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
       "license": "MIT"
     },
-    "node_modules/@vue/devtools-kit": {
-      "version": "7.7.7",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/@vue/devtools-kit/-/devtools-kit-7.7.7.tgz",
-      "integrity": "sha512-wgoZtxcTta65cnZ1Q6MbAfePVFxfM+gq0saaeytoph7nEa7yMXoi6sCPy4ufO111B9msnw0VOWjPEFCXuAKRHA==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/devtools-shared": "^7.7.7",
-        "birpc": "^2.3.0",
-        "hookable": "^5.5.3",
-        "mitt": "^3.0.1",
-        "perfect-debounce": "^1.0.0",
-        "speakingurl": "^14.0.1",
-        "superjson": "^2.2.2"
-      }
-    },
-    "node_modules/@vue/devtools-shared": {
-      "version": "7.7.7",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/@vue/devtools-shared/-/devtools-shared-7.7.7.tgz",
-      "integrity": "sha512-+udSj47aRl5aKb0memBvcUG9koarqnxNM5yjuREvqwK6T3ap4mn3Zqqc17QrBFTqSMjr3HK1cvStEZpMDpfdyw==",
-      "license": "MIT",
-      "dependencies": {
-        "rfdc": "^1.4.1"
-      }
-    },
     "node_modules/@vue/reactivity": {
       "version": "3.5.17",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/@vue/reactivity/-/reactivity-3.5.17.tgz",
@@ -5267,15 +5243,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/birpc": {
-      "version": "2.4.0",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/birpc/-/birpc-2.4.0.tgz",
-      "integrity": "sha512-5IdNxTyhXHv2UlgnPHQ0h+5ypVmkrYHzL8QT+DwFZ//2N/oNV8Ch+BCRmTJ3x6/z9Axo/cXYBc9eprsUVK/Jsg==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/bmp-js": {
       "version": "0.1.0",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/bmp-js/-/bmp-js-0.1.0.tgz",
@@ -5778,21 +5745,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/copy-anything": {
-      "version": "3.0.5",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/copy-anything/-/copy-anything-3.0.5.tgz",
-      "integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
-      "license": "MIT",
-      "dependencies": {
-        "is-what": "^4.1.8"
-      },
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/core-js": {
       "version": "3.43.0",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/core-js/-/core-js-3.43.0.tgz",
@@ -6961,12 +6913,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/hookable": {
-      "version": "5.5.3",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/hookable/-/hookable-5.5.3.tgz",
-      "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
-      "license": "MIT"
-    },
     "node_modules/html-encoding-sniffer": {
       "version": "2.0.1",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
@@ -7294,18 +7240,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/is-what": {
-      "version": "4.1.16",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/is-what/-/is-what-4.1.16.tgz",
-      "integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.13"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mesqueeb"
-      }
-    },
     "node_modules/isbinaryfile": {
       "version": "5.0.4",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/isbinaryfile/-/isbinaryfile-5.0.4.tgz",
@@ -8687,12 +8621,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mitt": {
-      "version": "3.0.1",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/mitt/-/mitt-3.0.1.tgz",
-      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
-      "license": "MIT"
-    },
     "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -9078,12 +9006,6 @@
       "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "license": "MIT"
     },
-    "node_modules/perfect-debounce": {
-      "version": "1.0.0",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-      "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
-      "license": "MIT"
-    },
     "node_modules/phin": {
       "version": "2.9.3",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/phin/-/phin-2.9.3.tgz",
@@ -9119,12 +9041,13 @@
       }
     },
     "node_modules/pinia": {
-      "version": "3.0.3",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/pinia/-/pinia-3.0.3.tgz",
-      "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
+      "version": "2.3.1",
+      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/pinia/-/pinia-2.3.1.tgz",
+      "integrity": "sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-api": "^7.7.2"
+        "@vue/devtools-api": "^6.6.3",
+        "vue-demi": "^0.14.10"
       },
       "funding": {
         "url": "https://github.com/sponsors/posva"
@@ -9139,15 +9062,6 @@
         }
       }
     },
-    "node_modules/pinia/node_modules/@vue/devtools-api": {
-      "version": "7.7.7",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
-      "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/devtools-kit": "^7.7.7"
-      }
-    },
     "node_modules/pirates": {
       "version": "4.0.7",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/pirates/-/pirates-4.0.7.tgz",
@@ -9798,12 +9712,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rfdc": {
-      "version": "1.4.1",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
-      "license": "MIT"
-    },
     "node_modules/rimraf": {
       "version": "3.0.2",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/rimraf/-/rimraf-3.0.2.tgz",
@@ -10216,15 +10124,6 @@
         "source-map": "^0.6.0"
       }
     },
-    "node_modules/speakingurl": {
-      "version": "14.0.1",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/speakingurl/-/speakingurl-14.0.1.tgz",
-      "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/sprintf-js/-/sprintf-js-1.0.3.tgz",
@@ -10372,18 +10271,6 @@
       "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
       "license": "MIT"
     },
-    "node_modules/superjson": {
-      "version": "2.2.2",
-      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/superjson/-/superjson-2.2.2.tgz",
-      "integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
-      "license": "MIT",
-      "dependencies": {
-        "copy-anything": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
     "node_modules/supports-color": {
       "version": "7.2.0",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/supports-color/-/supports-color-7.2.0.tgz",
@@ -11023,6 +10910,32 @@
         }
       }
     },
+    "node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/vue-i18n": {
       "version": "9.14.4",
       "resolved": "http://25.12.10.69:8081/repository/aliyun-npm/vue-i18n/-/vue-i18n-9.14.4.tgz",
diff --git a/package.json b/package.json
index e50b39a7..11a36ba7 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@dcloudio/uni-mp-xhs": "3.0.0-4060620250520001",
     "@dcloudio/uni-quickapp-webview": "3.0.0-4060620250520001",
     "crypto-js": "^3.1.9-1",
-    "pinia": "3.0.3",
+    "pinia": "^2.3.1",
     "terser": "^5.42.0",
     "uuid": "^11.1.0",
     "vue": "^3.5.11",
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 7726f5fe..319e81b4 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -44,11 +44,11 @@
 						src="@/static/images/course/play.png" 
 						style="width: 100%;height: 100%;"
 						@click="playVoice"
-						v-show="props.activeVoiceId !== dataInfo.id"
+						v-show="!isPlaying"
 					></image>
 					<image 
 						class="icon" 
-						v-show="props.activeVoiceId === dataInfo.id" 
+						v-show="isPlaying" 
 						src="@/static/images/course/pause.png" 
 						style="width: 100%;height: 100%;"
 						@click="pauseVoice"
@@ -86,12 +86,12 @@
 				<view class="play-btn">
 					<image class="icon" 
 						@click="playQnsVoice('qns', dataInfo)"
-						v-show="props.activeVoiceId !== dataInfo.id"
+						v-show="!isPlaying"
 						src="@/static/images/course/play-blue.png" 
 						style="width: 100%;height: 100%;"
 					></image>
 					<image class="icon"
-						v-show="props.activeVoiceId === dataInfo.id" 
+						v-show="isPlaying" 
 						@click="pauseVoice"
 						src="@/static/images/course/stop-blue.png" 
 						style="width: 100%;height: 100%;"
@@ -148,15 +148,19 @@ import { getUserInfo } from '@/common/common';
 		isLast:{
 			default:false,
 			type: Boolean
-		}
+		},
+		isPlaying:{
+			default:false,
+			type: Boolean
+		},
 	})
-	const { type, dataInfo, activeVoiceId } = toRefs(props)
+	const { type, dataInfo, activeVoiceId, isPlaying, isLast} = toRefs(props)
 	const emit = defineEmits(['changePlay', 'nextQuestion'])
 	// 声音播放初始化
 	const talkVoiceObj = ref(uni.createInnerAudioContext())
 	const userInfo = computed(() => getUserInfo())
-	watch(() => props.activeVoiceId,(val) => {
-		if(val && (val !== unref(dataInfo).id)){
+	watch(() => props.isPlaying,(val) => {
+		if(!val){
 			talkVoiceObj.value?.stop()
 		}
 	},{
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index f38c9e9f..fe3b49de 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -49,6 +49,7 @@
 					:type="item.type" 
 					:dataInfo="item"
 					:activeVoiceId="activeVoiceTalkingItemId"
+					:isPlaying="activeVoiceTalkingItemId === item.id"
 					@changePlay="changePlayItemId"
 					@nextQuestion="nextQuestionSuccess"
 					:id="'item' + item.id"
@@ -139,7 +140,7 @@ const talkingList = ref([])
 const activeVoiceTalkingItemId = ref('')
 const answerValue = ref('')
 const inputRef = ref('')
-
+// 初始化数据
 const getData = async () => {
 	try{
 		const { body } = await getCourseStudyInfoApi({crsId: crsId.value})
@@ -205,7 +206,7 @@ const changePlayItemId = (id) => {
 		activeVoiceTalkingItemId.value = id
 	}
 }
-
+// 选择的教师对象信息
 const choiceTeacherInfo = computed(()=>{
 	return teacherList.value.find(t=> t.teacherNo === choiceTeacher.value)
 }) 

From bf638b894c5eddfee4918029efdeb293108457f8 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Tue, 1 Jul 2025 16:21:01 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/components/talkingItem.vue | 19 ++++++++++---------
 src/pages/course/study.vue                  | 19 +++++++++++++------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 319e81b4..ec6cd3cd 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -43,7 +43,7 @@
 						class="icon" 
 						src="@/static/images/course/play.png" 
 						style="width: 100%;height: 100%;"
-						@click="playVoice"
+						@click="playVoice()"
 						v-show="!isPlaying"
 					></image>
 					<image 
@@ -198,11 +198,13 @@ import { getUserInfo } from '@/common/common';
 		// readType 阅读内容类型pgrh段落/qns问题
 		emit('changePlay', unref(dataInfo)?.id)
 		if(itemVoice.value){
+		console.log(1111111,itemVoice.value)
 			setTimeout(()=>{
 				talkVoiceObj.value.src = itemVoice.value
 				talkVoiceObj.value.play()
 			},100)
 		}else{
+		console.log(2,itemVoice.value)
 			let _params = {
 				crsId: unref(dataInfo)?.crsId || '',
 				pgrphId: unref(dataInfo)?.pgrphId || '',
@@ -244,14 +246,13 @@ import { getUserInfo } from '@/common/common';
 	}
 	const showNextBtn = ref(true)
 	const goOnGetQues = () => {
-		// studyParagraphOverApi({
-		// 	pgrphId:unref(dataInfo)?.pgrphId
-		// }).then(res=>{
-		// 	showNextBtn.value = false
-		// 	emit('nextQuestion', unref(dataInfo))
-		// })
-		showNextBtn.value = false
-		emit('nextQuestion', unref(dataInfo))
+		studyParagraphOverApi({
+			pgrphId:unref(dataInfo)?.pgrphId,
+			logId:unref(dataInfo)?.logId,
+		}).then(res=>{
+			showNextBtn.value = false
+			emit('nextQuestion', unref(dataInfo))
+		})
 	}
 </script>
 
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index fe3b49de..b6f12d22 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -145,13 +145,13 @@ const getData = async () => {
 	try{
 		const { body } = await getCourseStudyInfoApi({crsId: crsId.value})
 		initsocketTask()
+		teacherList.value = body.teacheList.map(t=>({
+			...t,
+			voicePath: '',
+			voiceObj: null
+		}))
 		if(body.stdyProgressFlag === 'N'){
 			step.value = 1
-			teacherList.value = body.teacheList.map(t=>({
-				...t,
-				voicePath: '',
-				voiceObj: null
-			}))
 		}else{
 			common.show('提示信息', '此门课程已有学习历史，请选择是否继续学习？',true, '重新开始','继续学习').then((res) => {
 				if(res) {
@@ -218,6 +218,7 @@ const showKeyboard = () => {
 			let _data = {
 				qnsId: unref(lastTalkingInfo).qnsId,// 问题ID 必输项:true  类型:String
 				pgrphId: unref(lastTalkingInfo).pgrphId,// 段落ID 必输项:true  类型:String
+				qstLogId: unref(qstLogId),// 段落ID 必输项:true  类型:String
 				crsId: crsId.value,// 课程ID 必输项:true  类型:String
 				stdyBatch: stdyBatch.value,// 学习批次 必输项:true  类型:String
 				ansterContent: answerValue.value // 回答文本内容 必输项:false  类型:String
@@ -313,16 +314,19 @@ const getGraphInfoUnStudy = () => {
 		
 		pgrphNum.value = res.body.pgrphNum
 		showOrder.value = res.body.showOrder
+		logId.value = res.body.logId || ''
 		scrollToBottomNow()
 	})
 }
 const lastTalkingInfo = ref({})
+const qstLogId = ref('')
 // 获取问题
 const getQuestionInfoUnStudy = (pgrphId) => {
 	queryTraStdyBatchWaitQuestionInfoApi({
 		crsId: crsId.value,
 		stdyId: unref(stdyId),
 		stdyBatch: unref(stdyBatch),
+		logId: unref(logId),
 		pgrphId
 	}).then(res=>{
 		let _id = new Date().getTime() + 'id'
@@ -333,6 +337,7 @@ const getQuestionInfoUnStudy = (pgrphId) => {
 			id: _id
 		}
 		talkingList.value.push(lastTalkingInfo.value)
+		qstLogId.value = res.body.qstLogId
 		scrollToBottomNow()
 	})
 }
@@ -378,6 +383,7 @@ const isManualClose = ref(false) // 是否手动关闭
 
 const stdyId = ref('')
 const stdyBatch = ref('')
+const logId = ref('')
 // ws 初始化逻辑
 const initsocketTask = () => {
 	socketStore.creatSocket()
@@ -387,6 +393,7 @@ const initsocketTask = () => {
 			if(commond === 'STDYBTH' && !stdyId.value){
 				stdyId.value = body.stdyId || ''
 				stdyBatch.value = body.stdyBatch || ''
+				logId.value = body.logId || ''
 				getGraphInfoUnStudy()
 			}
 		}else{
@@ -489,11 +496,11 @@ const hideOverlayTalking = (obj) => {
 	stopRecord()
 	// #endif
 	if(!isOut.value){
-				console.log(11111111111111)
 		setTimeout(()=>{
 			let _data = {
 				qnsId: unref(lastTalkingInfo).qnsId,// 问题ID 必输项:true  类型:String
 				pgrphId: unref(lastTalkingInfo).pgrphId,// 段落ID 必输项:true  类型:String
+				qstLogId: unref(qstLogId),// 段落ID 必输项:true  类型:String
 				crsId: crsId.value,// 课程ID 必输项:true  类型:String
 				stdyBatch: stdyBatch.value,// 学习批次 必输项:true  类型:String
 				ansterContent: '',// 回答文本内容 必输项:false  类型:String