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

This commit is contained in:
田岩
2026-03-24 10:20:12 +08:00
+10 -5
View File
@@ -122,7 +122,7 @@
/> -->
<touch-btn @submitVoice="submitVoice" @sendLoading="sendLoading" @submitAnswer="submitAnswer"
@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
:adjustPosition="true" :isDisabled="isHistory || isSending" :disabledText="''" />
:adjustPosition="true" :isDisabled="isHistory || isSending" :disabledText="''" style="margin-left: 10rpx;"/>
<History ref="historyRef" @showDetail="showHistoryDetail"></History>
<PreviewVue ref="previewRef" />
@@ -364,6 +364,7 @@
setTimeout(() => {
stopAnswerCallBack.value = null;
answerIsOver.value = true;
isSending.value = false
}, 10);
return;
}
@@ -484,9 +485,13 @@
seqNo: seqNo.value
}
});
talkQnsList.value = [];
sendMessage({
commond: 'ASK',
body: data.askData
body: {
...data.askData,
isReload: true
}
});
// // 设置停止回调
// stopAnswerCallBack.value = ($data) => {
@@ -717,7 +722,7 @@
};
// 新发送语音前loading动画
const sendLoading = () => {
isSending.value = true
isSending.value = true
talkQnsList.value = [];
talkingList.value.push({
type: 'question',
@@ -738,7 +743,7 @@
// }
if (!ossKey) {
talkingList.value.pop();
isSending.value = false
isSending.value = false
uni.showToast({
title: '系统异常,请联系管理员',
icon: 'none',
@@ -757,7 +762,7 @@
});
} else {
talkingList.value.pop();
isSending.value = false
isSending.value = false
uni.showToast({
title: '未识别到文字',
icon: 'none',