From f154835449d8c7f31319932897902150712b42ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 27 Nov 2025 14:42:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 ++-- .env.development.yh | 2 +- src/pages/course/components/touchBtn.vue | 31 ++++++++++-------- src/pages/sparring/components/touchBtn.vue | 37 ++++++++++++++-------- 4 files changed, 45 insertions(+), 31 deletions(-) diff --git a/.env.development b/.env.development index 8723b259..8ac8badb 100644 --- a/.env.development +++ b/.env.development @@ -8,7 +8,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aitstest.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:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' @@ -16,14 +16,14 @@ ENV = 'development' # dev # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV # app入口 -VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' diff --git a/.env.development.yh b/.env.development.yh index 910048f4..e9359d3e 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -4,7 +4,7 @@ ENV = 'development.yh' VITE_APP_BASE_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_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/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 19aea28e..3d1a24b3 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -296,7 +296,13 @@ let _res = await getPermission() if (_res) { hasPermission.value = true - showOverlayTalking(obj); + setTimeout(()=>{ + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } }else{ showOverlayTalking(obj); @@ -310,18 +316,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -340,10 +345,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } diff --git a/src/pages/sparring/components/touchBtn.vue b/src/pages/sparring/components/touchBtn.vue index 5f51cd64..dd26ed33 100644 --- a/src/pages/sparring/components/touchBtn.vue +++ b/src/pages/sparring/components/touchBtn.vue @@ -6,7 +6,7 @@ {{'语音对话'}} - @@ -239,7 +239,13 @@ let _res = await getPermission() if (_res) { hasPermission.value = true - showOverlayTalking(obj); + setTimeout(()=>{ + if(!isGettingPermission.value){ + showOverlayTalking(obj); + }else{ + isGettingPermission.value = false + } + },100) } } else { showOverlayTalking(obj); @@ -253,18 +259,17 @@ let _recordPerm = await permission.requestAndroidPermission('android.permission.RECORD_AUDIO'); if (_recordPerm !== 1) { showTalkingModel.value = false; - common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定').then((res) => { - if (res) { - // 去开启权限 - permission.gotoAppPermissionSetting(); - } else { - // 取消 - common.navigateBack(); - } - }); + let res = await common.show('提示信息', '当前页面需要使用的录音权限，是否前往开启？', true, '取消', '确定') + if (res) { + // 去开启权限 + permission.gotoAppPermissionSetting(); + } else { + // 取消 + common.navigateBack(); + } return false } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } else { @@ -283,10 +288,10 @@ return false } else if (_state === 'not determined') { // startRecord() - isGettingPermission.value = false + // isGettingPermission.value = false return true } else { - isGettingPermission.value = false + // isGettingPermission.value = false return true } } @@ -359,8 +364,12 @@ }; onShow(()=>{ // stopRecord() + // if(isGettingPermission.value){ + // hideOverlayTalking() + // } }) onHide(()=>{ + console.log('onHide') isGettingPermission.value = true }) From fea819d199364c72b590d958928414ee7c7a993b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 27 Nov 2025 15:53:12 +0800 Subject: [PATCH 2/3] fix: bug --- src/pages/sparring/result.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 13afc20e..da1247cf 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -251,12 +251,14 @@ isLoading.value = false setTimeout(() => { showLoading.value = false - if(isPass.value && isOver.value && canLoad.value){ + if(isPass.value && isOver.value){ pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{}) } }, 800) } else { - setTimeout(getData, 2000) + if(canLoad.value){ + setTimeout(getData, 2000) + } } }).catch(()=>{ isLoading.value = false @@ -276,6 +278,7 @@ const isOver = ref(false) const goBack = () => { if(isOver.value){ + console.log(3) common.navigateBack(3) }else{ common.navigateBack() From 10c9fde2fa31bf894fb9bebea5524a99f886b78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 27 Nov 2025 21:01:13 +0800 Subject: [PATCH 3/3] fix: bug --- .env.development | 4 ++-- src/api/talk.js | 5 +++-- src/pages/sparring/talk.vue | 33 ++++++++++++++++++++++++++++++--- src/pages/sparring/talkCom.nvue | 29 ++++++++++++++++++++++------- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/.env.development b/.env.development index 8ac8badb..c476aba5 100644 --- a/.env.development +++ b/.env.development @@ -8,13 +8,13 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aitstest.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:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # 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 # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/api/talk.js b/src/api/talk.js index bf91d768..357ea49c 100644 --- a/src/api/talk.js +++ b/src/api/talk.js @@ -1,10 +1,11 @@ import request from '@/api/request' -export const prepareApi = (name) => { +export const prepareApi = (data) => { return request({ - url: '/trapractice/audio/session/prepare?name=' + name, + url: '/trapractice/traPartnerVoiceCall/voiceCallPrepare' , method: 'post', toastErrors: true, + data, baseUrl: 'http://25.64.32.157:9603' }); }; \ No newline at end of file diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue index b3ef3b56..e01bbd05 100644 --- a/src/pages/sparring/talk.vue +++ b/src/pages/sparring/talk.vue @@ -1,5 +1,5 @@