diff --git a/.env.development.yh b/.env.development.yh
index 474c810a..670788c2 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -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'
diff --git a/src/components/touch-btn/touch-btn.vue b/src/components/touch-btn/touch-btn.vue
index a24034ca..72e1119b 100644
--- a/src/components/touch-btn/touch-btn.vue
+++ b/src/components/touch-btn/touch-btn.vue
@@ -582,7 +582,7 @@
};
// 禁用时点击给的提示
const disabled_click = () => {
- if (props.isDisabled) {
+ if (props.isDisabled && props.disabledText) {
console.log('禁用时点击给的提示', props.disabledText);
common.msg(props.disabledText);
}
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index e98fb7ad..8b7c989e 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -168,7 +168,7 @@
{{ voiceTime }}
-
+
{{ showContent }}
@@ -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(() => {
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 7d57eeab..fea35909 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -147,7 +147,7 @@
/> -->
+ :adjustPosition="true" :isDisabled="isHistory" :disabledText="''"/>
@@ -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({