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/21] =?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/21] =?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/21] =?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/21] =?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}) \ No newline at end of file diff --git a/src/pages/index/components/todo-com/exam.vue b/src/pages/index/components/todo-com/exam.vue new file mode 100644 index 00000000..9c13c5ed --- /dev/null +++ b/src/pages/index/components/todo-com/exam.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/components/todo-com/item.scss b/src/pages/index/components/todo-com/item.scss new file mode 100644 index 00000000..aa6066e7 --- /dev/null +++ b/src/pages/index/components/todo-com/item.scss @@ -0,0 +1,115 @@ +.custom-todo-item.table-item{ + border-bottom: 2rpx solid #efefef; + margin-bottom: 25rpx; + position: relative; + padding-bottom: 32rpx; + &:last-child{ + border: 0; + } + .item-status{ + width: 100%; + font-size: 29rpx; + line-height: 40rpx; + margin-bottom: 14rpx; + color: #06f; + &.in-progress{ + color: #ff8a2d; + } + } + .item-title{ + overflow: hidden; + margin-bottom: 25rpx; + padding: 5rpx 0; + .item-type{ + float: left; + width: 64rpx; + height: 33rpx; + border-radius: 4rpx; + text-align: center; + font-size: 23rpx; + line-height: 30rpx; + box-sizing: border-box; + margin-right: 12rpx; + &.course-type{ + color: #06f; + border: 2rpx solid #06f; + background-color: rgba(0, 102, 255,.2); + } + &.exam-type{ + color: rgb(72, 174, 128); + border: 2rpx solid rgb(72, 174, 128); + background-color: rgba(72, 174, 128,.2); + } + &.task-type{ + color: rgb(130, 96, 253); + border: 2rpx solid rgb(130, 96, 253); + background-color: rgba(130, 96, 253,.2); + } + &.pk-type{ + color: rgb(245, 130, 73); + border: 2rpx solid rgb(245, 130, 73); + background-color: rgba(245, 130, 73,.2); + } + &.sparring-type{ + color: rgb(230, 192, 14); + border: 2rpx solid rgb(230, 192, 14); + background-color: rgba(230, 192, 14,.2); + } + } + .item-name{ + width: calc(100% - 76rpx); + float: left; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: 29rpx; + line-height: 33rpx; + font-weight: 600; + color: #333; + } + } + .item-info{ + min-height: 33rpx; + overflow: hidden; + .item-info-item{ + display: block; + color: #666; + font-size: 23rpx; + margin-bottom: 15rpx; + line-height: 33rpx; + height: 33rpx; + &:last-child{ + margin-bottom: 0; + } + &.inline-item{ + float: left; + margin-bottom: 0; + &+.inline-item{ + margin-left: 30rpx; + } + } + } + } + .item-btn{ + position: absolute; + background-color: #ebf1ff; + width: 120rpx; + height: 54rpx; + line-height: 54rpx; + color: #2c8ef2; + font-size: 25rpx; + text-align: center; + border-radius: 27rpx; + right: 0; + bottom: 23rpx; + } +} +.color-blue{ + color: #06f; +} +.color-black{ + color: #333; +} +.inline-item{ + float: left; +} \ No newline at end of file diff --git a/src/pages/index/components/todo-com/pk.vue b/src/pages/index/components/todo-com/pk.vue new file mode 100644 index 00000000..68777730 --- /dev/null +++ b/src/pages/index/components/todo-com/pk.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/components/todo-com/sparring.vue b/src/pages/index/components/todo-com/sparring.vue new file mode 100644 index 00000000..f5132ed3 --- /dev/null +++ b/src/pages/index/components/todo-com/sparring.vue @@ -0,0 +1,31 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/components/todo-com/task.vue b/src/pages/index/components/todo-com/task.vue new file mode 100644 index 00000000..4888eea0 --- /dev/null +++ b/src/pages/index/components/todo-com/task.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/components/todo-item.vue b/src/pages/index/components/todo-item.vue new file mode 100644 index 00000000..1cbbe9a2 --- /dev/null +++ b/src/pages/index/components/todo-item.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue index d59dcbcf..af3282ea 100644 --- a/src/pages/index/components/todo.vue +++ b/src/pages/index/components/todo.vue @@ -1,32 +1,53 @@ \ No newline at end of file From 3e52c98229071a9a41417beb7587e243117790ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 21 Jan 2026 17:24:05 +0800 Subject: [PATCH 19/21] =?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=5Ffeat:=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.development.yh | 4 +- src/api/index.js | 12 +++++- .../image-preview/preview-detail.vue | 5 ++- src/pages/index/components/todo-com/task.vue | 4 +- src/pages/index/components/todo.vue | 42 +++++++++++++++++-- 6 files changed, 58 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index 94f0d442..71da8ae4 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:7003' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' diff --git a/.env.development.yh b/.env.development.yh index 474c810a..33d4540f 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,10 +2,10 @@ 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_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' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' diff --git a/src/api/index.js b/src/api/index.js index cd5e5e84..47e4b10b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -88,4 +88,14 @@ export const queryCrsInfoByRecmd = (data) => { }; - +// 待办事项mycrs/queryHaveToDo +export const queryHaveToDo = (data) => { + /** + date 日期 String + **/ + return request({ + url: '/traapp/mycrs/queryHaveToDo', + method: 'post', + data + }); +}; diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue index c854bf0d..720121c9 100644 --- a/src/components/image-preview/preview-detail.vue +++ b/src/components/image-preview/preview-detail.vue @@ -322,7 +322,10 @@ movable-view image { width: 100%; } - + .detail-img { + width: calc(100% - 40rpx); + height: calc(100% - 100rpx); + } // .detail-img { // position: absolute; // left: 50%; diff --git a/src/pages/index/components/todo-com/task.vue b/src/pages/index/components/todo-com/task.vue index 4888eea0..300d8ce6 100644 --- a/src/pages/index/components/todo-com/task.vue +++ b/src/pages/index/components/todo-com/task.vue @@ -53,9 +53,9 @@ overflow: hidden; border-radius: 15rpx; position: absolute; - top: 8rpx; + top: 10rpx; left: 0; - height: 16rpx; + height: 14rpx; .bg-blue { height: 100%; diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue index af3282ea..d0996799 100644 --- a/src/pages/index/components/todo.vue +++ b/src/pages/index/components/todo.vue @@ -10,6 +10,7 @@ + 点击加载更多 @@ -21,6 +22,9 @@ } from 'vue' import calendarCom from './calendar.vue' import todoItem from './todo-item.vue' + import { + queryHaveToDo + } from '@/api/index' const activeDate = ref('') const tableData = ref([]) const pageObj = ref({ @@ -29,11 +33,36 @@ limit: 10 }) const changeDate = (date) => { - getDataList(date) + activeDate.value = date + getDataList(date, 1) } - const getDataList = (date) => { + const showMoreBtn = computed(() => { + return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit + }) + const getMoreData = () => { + pageObj.value.page += 1 + getDataList(activeDate.value) + } + const getDataList = (date, flag) => { + if(flag === 1){ + tableData.value = [] + pageObj.value = { + totalNum: 0, + page: 1, + limit: 999 + } + } console.log('date: ' + date) - + console.log(pageObj.value) + queryHaveToDo({ + date, + ...pageObj.value + }).then(res => { + console.log(res) + let _arr = res.body || [] + pageObj.value.totalNum = res.total + tableData.value = tableData.value.concat(_arr) + }) } const handleDetail = (item) => { console.log(item) @@ -93,7 +122,12 @@ padding: 20rpx; .table-list { - padding: 0 16rpx; + padding: 16rpx; + } + .more-btn{ + color: rgb(144, 147, 153); + text-align: center; + font-size: 23rpx; } } \ No newline at end of file From 025e6be0ff3f114d766d52af0aac916674ae793d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 21 Jan 2026 17:24:46 +0800 Subject: [PATCH 20/21] =?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=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/image-preview/preview-detail.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue index c854bf0d..720121c9 100644 --- a/src/components/image-preview/preview-detail.vue +++ b/src/components/image-preview/preview-detail.vue @@ -322,7 +322,10 @@ movable-view image { width: 100%; } - + .detail-img { + width: calc(100% - 40rpx); + height: calc(100% - 100rpx); + } // .detail-img { // position: absolute; // left: 50%; From 16e85b5e0f1009c7fc1f761c207c8627f88c4e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Mon, 26 Jan 2026 08:29:29 +0800 Subject: [PATCH 21/21] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 ++-- src/pages/course/components/touchBtn.vue | 36 ++++++++++++++++-------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.env.development b/.env.development index 71da8ae4..df11febe 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:7003' +#VITE_APP_BASE_API_Url = 'http://25.64.32.154:9601' # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' @@ -16,7 +16,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # dev -#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # sit @@ -47,7 +47,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.150:9601' + VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 2cb5dddc..a5d9d42e 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -60,8 +60,8 @@ @@ -151,9 +151,9 @@ adjustPosition, formatType } = toRefs(props); - - + + const isLoadingState = computed(() => props.isLoading); const showTalkingModel = ref(false); @@ -301,6 +301,15 @@ } } }); + unref(recordObjCom).onError((err) => { + isRecording.value = false + isGettingPermission.value = false + if (showTalkingModel.value) { + closeModel(); + } + common.msg(err) + // common.msg(err'语音输入错误，请重试！') + }); }; @@ -326,15 +335,16 @@ const stopRecord = () => { isStopNum.value = isStartNum.value; try { - if (unref(recordObjCom).stop) { + if (isRecording.value && unref(recordObjCom).stop) { + setTimeout(() => { + isGettingPermission.value = false + }, 1000) unref(recordObjCom).stop(); - if (!transVoiceIng.value) { - console.log('1234') - setTimeout(() => { - closeModel() - }, 300) - } + setTimeout(() => { + closeModel() + }, 300) } else { + isGettingPermission.value = false closeModel(); } } catch { @@ -618,7 +628,9 @@ onHide(() => { isGettingPermission.value = true }) - defineExpose({clearInputText}) + defineExpose({ + clearInputText + })