diff --git a/.env.development b/.env.development index e1778666..a2d7fdbc 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -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' diff --git a/.env.development.yh b/.env.development.yh index 2b8b529b..193ce295 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/sparring/components/touchBtn.vue b/src/pages/sparring/components/touchBtn.vue index 2598f6df..b2fa17d1 100644 --- a/src/pages/sparring/components/touchBtn.vue +++ b/src/pages/sparring/components/touchBtn.vue @@ -129,7 +129,8 @@ unref(recordObjCom)?.onStop((res, duration) => { isRecording.value = false if(isGettingPermission.value){ - isGettingPermission.value = false + isGettingPermission.value = false + closeModel(); return } audioPath.value = res.tempFilePath; @@ -192,12 +193,17 @@ const stopRecord = () => { isStopNum.value = isStartNum.value; try { - if (unref(recordObjCom).stop) { + if (isRecording.value && unref(recordObjCom).stop) { unref(recordObjCom).stop(); + setTimeout(()=>{ + isGettingPermission.value = false + }, 500) } else { + isGettingPermission.value = false closeModel(); } } catch { + isGettingPermission.value = false closeModel(); } }; @@ -302,10 +308,8 @@ return false } else if (_state === 'not determined') { // startRecord() - // isGettingPermission.value = false return true } else { - // isGettingPermission.value = false return true } } @@ -319,8 +323,11 @@ const showOverlayTalking = (obj) => { if (showTalkingModel.value) return; if (isGettingPermission.value) { - stopRecord() - isGettingPermission.value = false + if(isRecording.value){ + stopRecord() + }else{ + isGettingPermission.value = false + } return } if (isLoadingState.value) { @@ -345,7 +352,6 @@ startRecord(); // #endif setTimeout(() => { - console.log(_recnum, recNum.value) if (_recnum === recNum.value) { hideOverlayTalking(recNum.value); } @@ -383,7 +389,6 @@ // } }) onHide(()=>{ - console.log('onHide') isGettingPermission.value = true }) diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 7227ae33..7440fe34 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -698,5 +698,8 @@ :deep(.uv-tabs__wrapper__nav__item) { padding: 0 20rpx !important; } + :deep(uv-tabs__wrapper__nav__item__text){ + white-space: nowrap; + } } \ No newline at end of file