Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

2026-03-11 10:16:13 +08:00
parent df7b0baf64 a03f41e450
commit c6c014aa6d
2 changed files with 35 additions and 44 deletions
@@ -522,7 +522,7 @@
 										// 去评论
 										common.redirectTo(
 											`/pages/courseDetail/index?tabAct=2&crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`
-											)
+										)
 									} else {
 										// 取消
 										common.navigateBack()
@@ -949,17 +949,6 @@
 			common.msg('每个问题最多连续发送五次答案！')
 			return
 		}
-		isUploadingVoice.value = true
-		let _data = {
-			stdyId: unref(stdyId),
-			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
-			asrStartTm: unref(lastTalkingInfo).asrStartTm
-		}
 		let _id = new Date().getTime() + 'id'
 		//#ifndef APP-PLUS
 		// h5 假数据
@@ -987,8 +976,10 @@
 	}) => {
 		if (!ossKey) {
 			common.msg('系统异常，请联系管理员');
+			setIsUploadingVoice()
 		} else if (text === '') {
 			common.msg('未识别到文字');
+			setIsUploadingVoice()
 		} else {
 			let _data = {
 				stdyId: unref(stdyId),
@@ -1004,37 +995,37 @@
 			}
 			let _id = new Date().getTime() + 'id'
 			unref(ajaxApi)({
-				processType: 'ANSER-VOICE',
-				requestBody: JSON.stringify(_data)
-			})
-			.then(res => {
-				let _obj = {
-					crsId: crsId.value,
-					pgrphId: _data.pgrphId,
-					qstLogId: _data.qstLogId,
-					qnsId: _data.qnsId,
-					talkingContent: text,
-					bucketKey: ossKey,
-					text,
-					talkingVoice: '',
-					recordId: res.body.chatBody.recordId,
-					asrStartTm: unref(lastTalkingInfo).asrStartTm,
-					stdyPgrphId: res.body.chatBody.stdyPgrphId,
-					type: 1,
-					isLoading: false,
-					userInfo: {
-						...choiceTeacherInfo.value
-					},
-					id: _id,
-					voiceTime: 0
-				}
-				talkingList.value.push(_obj)
-				scrollToBottomNow()
-				setIsUploadingVoice()
-			})
-			.catch((err) => {
-				setIsUploadingVoice()
-			})
+					processType: 'ANSER-VOICE',
+					requestBody: JSON.stringify(_data)
+				})
+				.then(res => {
+					let _obj = {
+						crsId: crsId.value,
+						pgrphId: _data.pgrphId,
+						qstLogId: _data.qstLogId,
+						qnsId: _data.qnsId,
+						talkingContent: text,
+						bucketKey: ossKey,
+						text,
+						talkingVoice: '',
+						recordId: res.body.chatBody.recordId,
+						asrStartTm: unref(lastTalkingInfo).asrStartTm,
+						stdyPgrphId: res.body.chatBody.stdyPgrphId,
+						type: 1,
+						isLoading: false,
+						userInfo: {
+							...choiceTeacherInfo.value
+						},
+						id: _id,
+						voiceTime: 0
+					}
+					talkingList.value.push(_obj)
+					scrollToBottomNow()
+					setIsUploadingVoice()
+				})
+				.catch((err) => {
+					setIsUploadingVoice()
+				})
 		}
 	}
 	const uploadRecordNow = (voicePath, voiceTime) => {
@@ -80,7 +80,7 @@
 			 :isDisabled="false" 
 			 v-if="detailInfo.traInterTyp === '01'" /> -->

-			<touch-btn class="body-bottom" @submitVoice="submitVoice" @sendLoading="sendLoading" @submitAnswer="submitAnswer"
+			<touch-btn class="body-bottom" @submitVoice="submitVoice" @sendLoading="sendLoading" @submitAnswer="()=>{}"
 				@startRecord="changePlayItemId('')" :isLoading="!answerIsOver" :isDisabled="false" theme="blue"
 				answerMethod="03" v-if="detailInfo.traInterTyp === '01'" >