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

src/pages/course/study.vue

@@ -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),

src/pages/sparring/tip.vue

@@ -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'" >