From 29b42e89b94a1581dd98b73e0bdb51ba150beac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 08:47:10 +0800 Subject: [PATCH 1/3] fix : bug --- .env.development | 8 ++++---- src/pages/course/study.vue | 5 ++++- src/pages/search/result.vue | 30 +++++++++++++++++++----------- 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.env.development b/.env.development index 6499d215..1e85ccee 100644 --- a/.env.development +++ b/.env.development @@ -20,23 +20,23 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # UAT # 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_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604' # 张建成 # 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' +VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 于嘉文 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' # 孙宇 diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 949e6d3b..d3da72a0 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -540,7 +540,10 @@ const nextQuestionSuccess = (info, type = 'next') => { // 重新回答 unref(ajaxApi)({ processType: 'NEW-ANSER', //NEW-KNOW - requestBody: info.qnsId + requestBody: JSON.stringify({ + stdyId: unref(stdyId), + qnsId: info.qnsId + }) }).then(res => { let _body = res.body || {} if (!_body.chatBody) { diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index efe4ce28..92ba6afa 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -18,7 +18,7 @@ - {{ hasMore ? '滚动加载更多' : '全部加载完成' }} + {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} @@ -60,7 +60,7 @@ - {{ hasMore ? '滚动加载更多' : '全部加载完成' }} + {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} 暂无数据 @@ -73,7 +73,7 @@ - {{ hasMore ? '滚动加载更多' : '全部加载完成' }} + {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} 暂无数据 @@ -94,7 +94,7 @@ - {{ hasMore ? '滚动加载更多' : '全部加载完成' }} + {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} 暂无数据 @@ -116,7 +116,7 @@ const fromType = ref('') onLoad(params => { inputValue.value = params.searchName fromType.value = params.from - pageInfo.value.limit = fromType.value === 'course' ? 15 : 3 + pageInfo.value.limit = fromType.value === 'course' ? 20 : 3 }) onShow(() => { search() @@ -236,16 +236,16 @@ const changeTab = item => { case 'ability': break case 'course': - pageInfo.value.limit = 15 + pageInfo.value.limit = 20 break case 'task': - pageInfo.value.limit = 15 + pageInfo.value.limit = 20 break case 'test': - pageInfo.value.limit = 15 + pageInfo.value.limit = 20 break case 'exam': - pageInfo.value.limit = 15 + pageInfo.value.limit = 20 break default: pageInfo.value.limit = 3 @@ -292,6 +292,7 @@ const getData = (flag = null) => { taskList.value = [] } let _isCourse = fromType.value === 'course' || activeTab.value==='course' + isLoading.value = true appSearchCrsApi({ type: _isCourse ? '01' : activeTab.value==='exam' ? '02' @@ -328,15 +329,22 @@ const getData = (flag = null) => { // pageInfo.value.total = res.total || 0 // break // } - }) + }).finally(()=> { + isLoading.value = false + }) } +const isLoading = ref(false) const hasMore = computed(() => { - return pageInfo.value.limit * pageInfo.value.page <= pageInfo.value.total + return (pageInfo.value.limit * pageInfo.value.page <= pageInfo.value.total) +}) +const showGetMore = computed(() => { + return hasMore.value || isLoading.value }) const scrolltolower = () => { if (!hasMore.value) { return } + if(!activeTab.value || activeTab.value === 'all') return pageInfo.value.page += 1 getData() } From efd34cd23930ed88ff697162ed9891170e2d848f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 09:02:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++++---- src/pages/search/result.vue | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index e1cdd1e3..46718ed4 100644 --- a/.env.development +++ b/.env.development @@ -20,23 +20,23 @@ VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # UAT # 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_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_TRASTUDY = 'http://25.64.16.144:9602' # 王洋洋 -VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' +# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 于嘉文 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' # 孙宇 diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index 92ba6afa..d286b354 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -18,7 +18,10 @@ - {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} + + {{ isLoading ? '' + : (showGetMore ? '滚动加载更多' : '全部加载完成') }} + @@ -60,7 +63,9 @@ - {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} + {{ isLoading ? '' + : (showGetMore ? '滚动加载更多' : '全部加载完成') }} + 暂无数据 @@ -73,7 +78,9 @@ - {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} + {{ isLoading ? '' + : (showGetMore ? '滚动加载更多' : '全部加载完成') }} + 暂无数据 @@ -94,7 +101,9 @@ - {{ showGetMore ? '滚动加载更多' : '全部加载完成' }} + {{ isLoading ? '' + : (showGetMore ? '滚动加载更多' : '全部加载完成') }} + 暂无数据 @@ -384,6 +393,15 @@ const toCourseDetail = item => { text-align: center; color: #999; font-size: 25rpx; + overflow: hidden; + min-height: 50rpx; + position: relative; + .loading-box{ + position: absolute; + left:50%; + top: 50%; + transform: translate(-50%, -50%); + } } .model-view { border: 2px solid #f1f1f1; From aa8218d496c84d7cfb7774de34a1ebdc68869bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 09:24:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/study.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index d3da72a0..888961a1 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -792,7 +792,8 @@ const uploadRecordNow = voicePath => { id: _id }) scrollToBottomNow() - commonUploadVoiceFile(voicePath, '/trastudy/traStdychat/voiceChart', { + let _path = isPreview.value ? '/trastudy/traStdychat/previewVoiceChart' : '/trastudy/traStdychat/voiceChart' + commonUploadVoiceFile(voicePath, _path, { processType: 'ANSER-VOICE', requestBody: JSON.stringify(_data) })