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] =?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)
 		}