From 0360b86284e0b1c46573c8b5cad72916418896f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 18 Sep 2025 13:48:02 +0800 Subject: [PATCH 1/4] fix: bug --- .env.development | 6 +++--- src/pages/examRanking/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 70d0ab7c..6d2d1a9c 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 开发环境 ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' @@ -33,11 +33,11 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786' # 任东 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' +# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 张建成 -#VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' +# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.144:9602' # 王洋洋 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' diff --git a/src/pages/examRanking/index.vue b/src/pages/examRanking/index.vue index 66a536d0..b11aff45 100644 --- a/src/pages/examRanking/index.vue +++ b/src/pages/examRanking/index.vue @@ -49,7 +49,7 @@ - + {{userRankObj.userName}} From 8c75aefc1c958c7c9fb5f1385790b45e97a81919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 18 Sep 2025 14:31:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9B=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/pages/course/index.vue | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 6d2d1a9c..2110ce07 100644 --- a/.env.development +++ b/.env.development @@ -32,8 +32,8 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # 任东 -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' +VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 张建成 diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index a9740701..3767745b 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -269,6 +269,7 @@ const pageObj = ref({ total: 0 }) const getMoreList = flag => { + console.log(activeTab.value) if (!flag) { if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) return pageObj.value.page += 1 @@ -298,6 +299,14 @@ const getMoreList = flag => { case '最新': break case '推荐': + queryCrsInfoByRecmdApi(pageObj.value) + .then(res => { + courseListBase.value = courseListBase.value.concat(res.body || []) + pageObj.value.total = res.total + }) + .finally(() => { + loading.value = false + }) break case '生产线': queryCrsInfoByPrdLineApi({ @@ -360,6 +369,7 @@ const changeTab = item => { queryCrsInfoByRecmdApi(pageObj.value) .then(res => { courseListBase.value = res.body || [] + pageObj.value.total = res.total }) .finally(() => { loading.value = false From 1f45b0a0c308589f6faa418cf57cebf3d60fdb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 18 Sep 2025 15:34:24 +0800 Subject: [PATCH 3/4] fix: bug --- src/pages/course/components/talkingItem.vue | 2 - .../courseRecord/components/esQuestion.vue | 110 +--- .../components/esQuestionAnswer.vue | 77 ++- .../courseRecord/components/talkingItem.vue | 532 ++++++++++-------- .../courseRecord/courseStudyRecordDetail.vue | 48 +- 5 files changed, 403 insertions(+), 366 deletions(-) diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index f5f1a5b1..7a84a470 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -466,12 +466,10 @@ pauseVoice(); }); let prevTime = -1; - let activeTime = -1; talkVoiceObj.value.onEnded(() => { console.log('onEnded'); emit('changePlay', ''); prevTime = -1; - activeTime = -1; talkVoiceObj.value.src = ''; }); talkVoiceObj.value.onStop(() => { diff --git a/src/pages/courseRecord/components/esQuestion.vue b/src/pages/courseRecord/components/esQuestion.vue index f62e5503..98f20e73 100644 --- a/src/pages/courseRecord/components/esQuestion.vue +++ b/src/pages/courseRecord/components/esQuestion.vue @@ -6,7 +6,8 @@ 你的答案： - + @@ -37,17 +38,25 @@ talkingVoice: '' }), type: Object + }, + activeVoiceId: { + default: '', + type: String } }); const { - dataInfo + dataInfo, + activeVoiceId } = toRefs(props); const intrctWay = computed(() => { - console.log('props.intrctWay', props.intrctWay); return props.intrctWay; }); const emit = defineEmits(['changePlay', 'buutton_click']); + const changePlay = (val) => { + console.log('esq') + emit('changePlay', val) + } watch( () => props.dataInfo, () => {}, { @@ -57,7 +66,7 @@ ); const initData = (item) => { return { - + } } // 声音播放初始化 @@ -74,81 +83,11 @@ const showContent = computed(() => { return props.text || props.dataInfo.anserResult || ''; }); - onMounted(() => { - initVoice(); - }); - onUnload(() => { - pauseVoice(); - }); - watch( - () => props.dataInfo.talkingVoice, - (val) => { - if (val) { - initVoice(); - } - }, { - deep: true, - immediate: true - } - ); // 按钮点击 const buutton_click = (type) => { emit('buutton_click', type, props.dataInfo); }; - const pauseVoice = () => { - if (!talkVoiceObj.value) return; - talkVoiceObj.value.pause(); - isPlaying.value = false; - emit('changePlay', ''); - }; - const playVoice = () => { - emit('changePlay', unref(dataInfo)?.id); - if (talkVoiceObj.value && talkVoiceObj.value.src) { - talkVoiceObj.value.play(); - return; - } else { - talkVoiceObj.value.src = ''; - if (unref(dataInfo).talkingVoice) { - setTimeout(() => { - talkVoiceObj.value.src = unref(dataInfo).talkingVoice; - talkVoiceObj.value.play(); - isPlaying.value = true; - }, 100); - } - } - }; - const initVoice = () => { - talkVoiceObj.value = uni.createInnerAudioContext(); - talkVoiceObj.value.onEnded(() => { - emit('changePlay', ''); - talkVoiceObj.value.src = ''; - }); - talkVoiceObj.value.onError(() => { - talkVoiceObj.value.src = ''; - }); - if (unref(dataInfo).intrctWay === '02') { - itemVoice.value = unref(dataInfo).talkingVoice; - talkVoiceObj.value.src = itemVoice.value; - setTimeout(() => { - setVoiceTime(0); - }, 100); - } - }; - const setVoiceTime = (sum) => { - sum += 1; - if (Math.ceil(talkVoiceObj.value.duration) > 0) { - voiceTime.value = (Math.ceil(talkVoiceObj.value.duration) || 1) + 's'; - } else { - if (sum === 20) { - voiceTime.value = 0 + 's'; - return; - } - setTimeout(() => { - setVoiceTime(sum); - }, 200); - } - }; \ No newline at end of file diff --git a/src/pages/courseRecord/components/esQuestionAnswer.vue b/src/pages/courseRecord/components/esQuestionAnswer.vue index 86770318..e16214e9 100644 --- a/src/pages/courseRecord/components/esQuestionAnswer.vue +++ b/src/pages/courseRecord/components/esQuestionAnswer.vue @@ -1,6 +1,6 @@