diff --git a/.env.development b/.env.development index 03b74a85..8ac85af9 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' @@ -15,7 +15,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://192.168.108.129' # dev -VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit diff --git a/.env.development.yh b/.env.development.yh index 474c810a..e5b3101e 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,9 +2,9 @@ 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.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_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 0f3a51a2..3e0fd12d 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -10,7 +10,7 @@ placeholder="请输入文字"> - + - + 发送 @@ -51,10 +51,10 @@ - + - + @@ -231,7 +231,8 @@ } audioPath.value = res.tempFilePath; console.log(isOut.value, isOutLeft.value, isOutRight.value) - if (!isOut.value) { + if (!isOut.value && (props.answerMethod !== '02')) { + console.log(11111111111) if (startFlag.value !== 2) { closeModel(() => { nextTick(() => { @@ -249,7 +250,7 @@ } else if (isOutLeft.value) { console.log('取消') closeModel(); - } else if (isOutRight.value) { + } else if (isOutRight.value || (props.answerMethod === '02')) { console.log('转文本') transLoading.value = true commonUploadVoiceFile(audioPath.value, '/traapp/voice/voiceChart', {}).then(res => { @@ -551,7 +552,7 @@ isMoving.value = false; if (!showTalkingModel.value) return; //#ifdef APP-PLUS - transVoiceIng.value = isOutRight.value + transVoiceIng.value = isOutRight.value || (props.answerMethod === '02') stopRecord(); // #endif diff --git a/src/pages/course/components/touchBtn1.vue b/src/pages/course/components/touchBtnOnlyVoice.vue similarity index 100% rename from src/pages/course/components/touchBtn1.vue rename to src/pages/course/components/touchBtnOnlyVoice.vue diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 20c28eae..4c87f03b 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -80,6 +80,20 @@ + { } const answerOnlyVoice = computed(() => { - return lastTalkingInfo.value.answerWay === 'V' + return lastTalkingInfo.value.answerWay === 'V' || (answerMethod.value === '03') }) const canAnswerText = computed(() => {