tianyan/tra-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
田岩
2026-03-12 17:32:42 +08:00
parent 8e0fc08bd3 3de3320b8d
commit 509b0b0017
4 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development.yh
+2 -2
View File
@@ -2,11 +2,11 @@
ENV = 'development.yh'
# 'development.yh'
VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
src/components/touch-btn/touch-btn.vue
+1 -1
View File
@@ -582,7 +582,7 @@
};
// 禁用时点击给的提示
const disabled_click = () => {
if (props.isDisabled) {
if (props.isDisabled && props.disabledText) {
console.log('禁用时点击给的提示', props.disabledText);
common.msg(props.disabledText);
}
src/pages/course/components/talkingItem.vue
+17 -11
View File
@@ -168,7 +168,7 @@
</view>
<view class="right-time">{{ voiceTime }}</view>
<view class="talking-cont" v-show="!dataInfo.isLoading">
<text :class="['talking-text translate-text loading']" v-show="!translateLoading">
<text :class="['talking-text translate-text loading']" v-show="!translateLoading && (type !== 1 || showTranslateText)">
{{ showContent }}
</text>
<view class="talking-text translate-text" v-if="translateLoading">
@@ -850,19 +850,25 @@
// }, 100);
};
const translateLoading = ref(false);
const showTranslateText = ref(false)
// 翻译
const translateVoice = (item) => {
if (!item.talkingVoice) return;
// if (!item.talkingVoice) return;
translateLoading.value = true;
uploadVoiceFile(item.talkingVoice, {})
.then((res) => {
let _data = JSON.parse(res.data);
item.talkingContent = _data.body.text;
translateLoading.value = false;
})
.catch(() => {
translateLoading.value = false;
});
// uploadVoiceFile(item.talkingVoice, {})
// .then((res) => {
// let _data = JSON.parse(res.data);
// item.talkingContent = _data.body.text;
// translateLoading.value = false;
// })
// .catch(() => {
// translateLoading.value = false;
// });
// item.talkingContent = _data.body.text;
setTimeout(() => {
showTranslateText.value = true
translateLoading.value = false;
}, 500)
};
const showNextBtn = ref(true);
const showGoonBtn = computed(() => {
src/pages/index/dialog.vue
+4 -1
View File
@@ -147,7 +147,7 @@
/> -->
<touch-btn @submitVoice="submitVoice" @sendLoading="sendLoading" @submitAnswer="submitAnswer"
@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
:adjustPosition="true" :isDisabled="isHistory" />
:adjustPosition="true" :isDisabled="isHistory" :disabledText="''"/>
<History ref="historyRef" @showDetail="showHistoryDetail"></History>
<PreviewVue ref="previewRef" />
@@ -705,6 +705,9 @@
// 新发送语音
const submitVoice = ({ossKey, text}) => {
console.log('新发送语音',ossKey,text);
// if (talkingList.value.length > 0 && talkingList.value[talkingList.value.length - 1].isLoading) {
// return
// }
if(!ossKey) {
talkingList.value.pop();
uni.showToast({