From 6d1f3f11425618ffb533d0a95580e67dfad12a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 09:04:23 +0800 Subject: [PATCH 01/10] fix: bug --- src/pages/course/index.vue | 15 +++++++++++---- src/pages/course/study.vue | 2 ++ src/pages/search/result.vue | 14 ++++++++------ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index bf86c119..987f53b0 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -132,7 +132,7 @@ import { queryCrsInfoByPopularApi, queryCrsInfoByRecmdApi } from "@/api/course.js" -import { onMounted, onActivated, ref, computed } from 'vue' +import { onMounted, onActivated, ref, computed, onUnmounted } from 'vue' import { onShow } from "@dcloudio/uni-app" const customStyle = { backgroundColor: "#ffffff", @@ -337,6 +337,13 @@ import { onShow } from "@dcloudio/uni-app" tagsTree.value = res.body||[] }) changeTab({name:'全部'}) + + uni.$on('refresh_course_list', () => { + changeTab({name:activeTab.value || '全部'}) + }); + }) + onUnmounted(() => { + uni.$off('refresh_course_list'); }) onActivated(() => { // 重新获取标签信息 @@ -345,9 +352,9 @@ import { onShow } from "@dcloudio/uni-app" }) changeTab({name:activeTab.value || '全部'}) }); - onShow(()=>{ - changeTab({name:activeTab.value || '全部'}) - }) + // onShow(()=>{ + // changeTab({name:activeTab.value || '全部'}) + // }) diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 7f4f777c..5e486fa9 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -347,6 +347,7 @@ const showOrder = ref(0) const isLastPgrph = ref(false) const backRouter = () => { // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) + uni.$emit('refresh_course_list'); common.navigateBack() } @@ -395,6 +396,7 @@ const getGraphInfoUnStudy = (flag = 0) => { }) .finally(() => {}) } + uni.$emit('refresh_course_list'); return } lastTalkingInfo.value = { diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index 070af948..01e4b795 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -19,7 +19,7 @@ line-color="#06f"> - + 功能 @@ -49,7 +49,7 @@ - + 课程 @@ -61,7 +61,7 @@ 暂无数据 - + 任务 @@ -73,7 +73,7 @@ 暂无数据 - + AI陪练 @@ -84,7 +84,7 @@ 暂无数据 - + 考试 @@ -241,7 +241,9 @@ const taskList = ref([]) const examList = ref([]) const courseList = ref([]) - + const showModelList = (typeName) => { + return ['','all', typeName].indexOf(activeTab.value) >= 0 + } const changeTab = (item) => { if (!item) return activeTab.value = item.type From 758e59800ea08557687c67286a10e4f850b6b2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 09:21:14 +0800 Subject: [PATCH 02/10] fix: bug --- src/pages/course/index.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 987f53b0..6a2c99c6 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -45,6 +45,7 @@ 筛选 + Date: Tue, 2 Sep 2025 09:33:49 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- src/pages/search/search.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 224e7ca9..ee561f1e 100644 --- a/.env.development +++ b/.env.development @@ -15,9 +15,9 @@ ENV = 'development' # h5专用地址 -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' +#VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001' # 任东 diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue index b794fd22..4c4cf6a7 100644 --- a/src/pages/search/search.vue +++ b/src/pages/search/search.vue @@ -88,7 +88,7 @@ }); const del_all = () => { - common.show('', '历史搜索记录清除后无法恢复,确认删除吗?').then((res) => { + common.show('', '确认删除全部搜索历史?').then((res) => { if (res) { common.setValue(storageKey, []); historyList.value = []; From b90162069eeb2e3a1e4a6a108a037e401de8da75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 10:00:17 +0800 Subject: [PATCH 04/10] fix: bug --- .env.development | 4 ++-- src/pages/course/study.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 224e7ca9..b9451c12 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' @@ -26,7 +26,7 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # 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_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/course/study.vue b/src/pages/course/study.vue index 5e486fa9..4fa1de10 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -79,6 +79,7 @@ @startRecord="changePlayItemId('')" :isLoading="isUploadingVoice" :onlyVoice="answerOnlyVoice" + :adjustPosition="true" :canAnswer="testAnswer" :canAnswerText="'每个问题最多连续发送五次答案!'" :isDisabled="(lastTalkingInfo.type || 0) !== 4" /> From 14f3b2e294490b196180541e80d17da4acd61137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 2 Sep 2025 11:09:23 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9D=A8=E8=88=AA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/index.js | 5 ++++- src/api/messageNotification.js | 8 +++++++ src/pages/course/study.vue | 35 +++++++++++++++++++++++------ src/pages/examination/index.vue | 39 +++++++++++++++++++++------------ src/pages/index/dialog.vue | 2 +- src/pages/index/index.vue | 5 ++++- 7 files changed, 71 insertions(+), 25 deletions(-) diff --git a/.env.development b/.env.development index fa050679..44372854 100644 --- a/.env.development +++ b/.env.development @@ -26,7 +26,7 @@ VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # 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_TRASTUDY = 'http://25.64.16.144:9602' # 王洋洋 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 于嘉文 diff --git a/src/api/index.js b/src/api/index.js index 5f5e6a05..cd5e5e84 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -85,4 +85,7 @@ export const queryCrsInfoByRecmd = (data) => { method: 'post', data }); -}; \ No newline at end of file +}; + + + diff --git a/src/api/messageNotification.js b/src/api/messageNotification.js index 72fa6ef2..3022df25 100644 --- a/src/api/messageNotification.js +++ b/src/api/messageNotification.js @@ -31,4 +31,12 @@ export const oneTimeRead = (data) => { toastErrors: true, data }); +}; + +export const noticeMessageCount = (data) => { + return request({ + url: base_url + '/traPersonalMessageNotice/noticeMessageCount', + method: 'post', + data + }); }; \ No newline at end of file diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 4fa1de10..4ff2eea2 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -79,8 +79,8 @@ @startRecord="changePlayItemId('')" :isLoading="isUploadingVoice" :onlyVoice="answerOnlyVoice" - :adjustPosition="true" :canAnswer="testAnswer" + :adjustPosition="true" :canAnswerText="'每个问题最多连续发送五次答案!'" :isDisabled="(lastTalkingInfo.type || 0) !== 4" /> @@ -667,6 +667,7 @@ const sendMessage = data => { const startPgrphId = ref('') const imageId = ref('') onLoad(params => { + changeAppHeightBottom() watchFlag.value = 1 isPreview.value = params.isPreview === 'preview' crsId.value = params.crsId || '' @@ -683,8 +684,24 @@ onMounted(() => { const keyboardHeight = ref('0px') const setHeight = res => { keyboardHeight.value = res.height + 'px' - scrollToBottomNow() + // scrollToBottomNow() } + + const keyBoardIsHide = computed(() => { + return parseInt(keyboardHeight.value) == 0 + }) + const bottomHeight = ref('0px') + const totalBotHeight = computed(()=> { + return keyBoardIsHide.value ? 0 + 'px': parseInt(keyboardHeight.value) - parseInt(bottomHeight.value) + 'px' + }) + const changeAppHeightBottom = (height) => { + //#ifdef APP-PLUS + // 获取系统信息 + const systemInfo = uni.getSystemInfoSync(); + // 计算安全区域底部高度 + bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px' + // #endif + } onHide(() => { //#ifdef APP-PLUS uni.offKeyboardHeightChange(setHeight) @@ -1040,11 +1057,14 @@ const chooseRateNow = item => { } -