From ec5b8ff0e347fc0df398aa648a5529e3180d2719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Fri, 16 Jan 2026 09:18:31 +0800 Subject: [PATCH 01/17] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E9=9C=80=E6=B1=82=5Ffix:=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/components/touchBtn.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 3e0fd12d..e18bbc37 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -23,7 +23,7 @@ mask-background-color="rgba(0,0,0,0.9)" bg-color="none" z-index="10007" @change="({show}) => {showTalkingModel = show}"> --> + @mask-click="maskClick" mask-background-color="rgba(0,0,0,0.9)"> @@ -216,11 +216,11 @@ const isGettingPermission = ref(false) const isStartNum = ref(0); const isStopNum = ref(0); + const transLoading = ref(false) //#ifdef APP-PLUS // app端 const recordObjCom = ref({}); const IsAndEnv = getPhoneEnvBool('AND'); - const transLoading = ref(false) const initRecord = () => { recordObjCom.value = uni.getRecorderManager(); unref(recordObjCom)?.onStop((res, duration) => { @@ -232,7 +232,6 @@ audioPath.value = res.tempFilePath; console.log(isOut.value, isOutLeft.value, isOutRight.value) if (!isOut.value && (props.answerMethod !== '02')) { - console.log(11111111111) if (startFlag.value !== 2) { closeModel(() => { nextTick(() => { @@ -548,6 +547,11 @@ }); } }; + const maskClick = ()=>{ + if(!transVoiceIng.value){ + closeModel() + } + } const hideOverlayTalking = (obj) => { isMoving.value = false; if (!showTalkingModel.value) return; From 4da058386242d4af5b4cb7c73ee3230ac50fee7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Fri, 16 Jan 2026 09:30:36 +0800 Subject: [PATCH 02/17] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E7=BB=83=E4=B9=A0?= =?UTF-8?q?=E5=92=8C=E8=80=83=E8=AF=95=E7=9A=84=E4=BB=85=E8=AF=AD=E9=9F=B3?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../courseDetail/components/introduce.vue | 3 +- src/pages/examination/index.vue | 15 ++++++- src/pages/practice/index.vue | 39 ++++++++++++------- 4 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.env.development b/.env.development index 94f0d442..f354029a 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7002' -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 = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' @@ -21,7 +21,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # sit -#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/pages/courseDetail/components/introduce.vue b/src/pages/courseDetail/components/introduce.vue index 116bef91..97a6f729 100644 --- a/src/pages/courseDetail/components/introduce.vue +++ b/src/pages/courseDetail/components/introduce.vue @@ -66,8 +66,7 @@ modelValue: Object }); import {ANSWER_METHOD_MAP} from '@/enum.js' - - const answerMethod = computed(() => ANSWER_METHOD_MAP[props.item?.answerMethod || ''] || ANSWER_METHOD_MAP['01']); + const answerMethod = computed(() => ANSWER_METHOD_MAP[props.modelValue?.answerMethod || ''] || ANSWER_METHOD_MAP['01']); const previewFile = info => { previewFileFnc({ fileId: info.fileId, diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 4f2443f2..c04e63d1 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -96,7 +96,20 @@ + - + - + + @@ -97,6 +111,7 @@ import CharactersSubject from '@/components/examination/characters-subject.vue'; // import TouchBtn from '@/components/examination/touchBtn.vue'; import TouchBtn from '@/pages/course/components/touchBtn.vue'; + import TouchBtnOnlyVoice from '@/pages/course/components/touchBtnOnlyVoice.vue'; import common from '@/common/common'; import { setPageCache, formatSeconds, getPageCache, setupKeyboardHeightListener } from '@/common/common'; import { commonUploadVoiceFile } from '@/api/common.js'; @@ -104,7 +119,6 @@ import { practiceAnswer, practiceCommit, queryCrsPracticeAnswerResult } from '@/api/practice.js'; import { startExamByCrs } from '@/api/examination.js'; import { startPracticeByCrs } from '@/api/practice.js'; - const swiperRef = ref(null); const feedbackRef = ref(null); const dialogRef = ref(null); @@ -117,7 +131,7 @@ let leaveStartTime = 0; // 离开开始时间 const mode = ref('practice'); // 考试 examination 练习practice const systemInfo = uni.getSystemInfoSync(); - + const paperData = reactive({ exrId: '', crsId: '', @@ -365,16 +379,15 @@ paperData.crsId = practice.crsId; paperData.name = practice.name; paperData.exrId = practice.exrId; + answerMethod.value = practice.answerMethod ?? '01'; storageTopicList.value = practice.qnsInfoVos.map((res) => ({ ...res, isPreview: false, clearResult: true, es_status: '', // 预设一下问答题的状态，'' 空为没有 00 转圈 01 播放，其他暂定 my_answer: [], - answerMethod:answerMethod.value + answerMethod: answerMethod.value })); - answerMethod.value = practice.answerMethod ?? '01' - console.log('answerMethod', answerMethod.value); addProblem(); // 记录练习起始时间 practiceStartTime = new Date().getTime(); @@ -477,12 +490,12 @@ onUnload(() => { stopTimer(); }); - + onBackPress((res) => { - if(res.from === 'backbutton') { - exit_practice() + if (res.from === 'backbutton') { + exit_practice(); return true; - } + } }); From ce84cffebe13b0bdecb59133b80029db103961b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Fri, 16 Jan 2026 09:37:26 +0800 Subject: [PATCH 03/17] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E4=BB=85=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E6=8C=89=E9=92=AE=E7=9A=84=E4=BC=A0=E5=85=A5=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/examination/index.vue | 1 + src/pages/practice/index.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index c04e63d1..08983e6b 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -106,6 +106,7 @@ loadingText="只能进行一条回答" :adjustPosition="false" :isDisabled="false" + :onlyVoice="true" :answerMethod="answerMethod" /> From 746491b1b6aa2c0d308ce99c703036224ed9b9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Fri, 16 Jan 2026 09:49:53 +0800 Subject: [PATCH 04/17] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?= =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?= =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E5=A2=9E=E5=8A=A0touchBtnOnlyVoice?= =?UTF-8?q?=E7=A1=AE=E5=AE=9E=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/pages/course/components/touchBtnOnlyVoice.vue | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index f354029a..94f0d442 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ ENV = 'development' #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7002' -#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 = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' @@ -21,7 +21,7 @@ ENV = 'development' # sit -VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' +#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' # UAT diff --git a/src/pages/course/components/touchBtnOnlyVoice.vue b/src/pages/course/components/touchBtnOnlyVoice.vue index 2e221eb8..d86b257c 100644 --- a/src/pages/course/components/touchBtnOnlyVoice.vue +++ b/src/pages/course/components/touchBtnOnlyVoice.vue @@ -487,6 +487,11 @@ }); } }; + const clearInputText = (text = '') => { + let oldText = answerValue.value + answerValue.value = text; + return oldText + } const changeBtn = () => { if (props.isDisabled) return; keyboardIsShow.value = !keyboardIsShow.value; @@ -495,6 +500,7 @@ onHide(() => { isGettingPermission.value = true }) + defineExpose({clearInputText})