From f0756f3d8a2b4cfd4249236715c15bc2e6841bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 17 Sep 2025 11:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84=E6=94=B6?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 8 ++--- src/pages/courseDetail/index.vue | 12 +++---- .../favorites/components/favoritesCourse.vue | 10 +++--- .../favorites/components/favoritesTask.vue | 33 ++++++++---------- src/pages/favorites/index.vue | 34 ++++++++----------- src/pages/learningTasks/details.vue | 11 ++---- src/pages/login/login.vue | 4 +-- 7 files changed, 48 insertions(+), 64 deletions(-) diff --git a/.env.development b/.env.development index 87a63ae8..a8eb1205 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 开发环境 ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # UAT # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' @@ -10,9 +10,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 -#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' +# VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' # VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786' -#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' +# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址x2 @@ -26,7 +26,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # dev # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786' # UAT # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index 2de16cca..43020f56 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -272,7 +272,7 @@ }); onLoad((params) => { crsId.value = params.crsId; - collectId.value = params.collectId || ''; + collectId.value = params.collectId || null; isPreview.value = params.isPreview || ''; }); onShow(() => { @@ -286,13 +286,11 @@ if (pages.length >= 2) { const prevPage = pages[pages.length - 2]; if (prevPage.route === 'pages/favorites/index') { + // if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.reload === 'function') { + // prevPage.$vm.$?.exposed?.reload('course', form.value); + // } + uni.$emit('update_course_item', form.value); - uni.$emit('refresh_favorites_list', { - type: 'course', - state: !!form.value.collectId, // 最终是收藏了还是取消了 - old: collectId.value, // 进入时候的收藏id - new: form.value.collectId // 新的收藏id - }); } } } diff --git a/src/pages/favorites/components/favoritesCourse.vue b/src/pages/favorites/components/favoritesCourse.vue index 15384c26..8a240617 100644 --- a/src/pages/favorites/components/favoritesCourse.vue +++ b/src/pages/favorites/components/favoritesCourse.vue @@ -17,7 +17,7 @@ v-for="(item, index) in data_list" @click="swipeActionClick" > - + {{ item.evalGrade ?? 0 }}分 @@ -80,10 +80,12 @@ }); }; - - + const reloadPage = () => { + total.value == -1; + reload(true); + }; defineExpose({ - + reloadPage }); const props = defineProps(['tabIndex', 'currentIndex']); diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue index 7491eece..af906472 100644 --- a/src/pages/favorites/components/favoritesTask.vue +++ b/src/pages/favorites/components/favoritesTask.vue @@ -17,7 +17,7 @@ v-for="(item, index) in data_list" @click="swipeActionClick" > - + 已完成 @@ -46,10 +46,6 @@ }}门课程 - @@ -104,7 +100,7 @@ } } setPageCache('learning_tasks_details', item); - common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`); + common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}&taskId=${item.taskId}`); }; const getStatusClass = (isFinish) => { if (isFinish === '02') return 'completed'; @@ -119,20 +115,21 @@ { immediate: true } ); }); - // const updateData = (item) => { - // console.log('收藏的updateData', item); - // console.log('收藏的updatedata_list', data_list); - // const index = data_list.findIndex((res) => res.taskId === item.taskId); - // console.log('updateData', index, item); - // if (index !== -1) { - // data_list[index] = item; - // } - // }; + + const updateData = (item) => { + // 这里是收藏记录，如果是取消收藏，那就得重新刷新列表 + if (item.collectionId === null) { + reload(); + } else { + const index = data_list.value.findIndex((res) => res.taskId === item.taskId); + if (index !== -1) { + data_list.value[index] = item; + } + } + }; defineExpose({ - // getData, - // refreshData, - // updateData + updateData }); diff --git a/src/pages/favorites/index.vue b/src/pages/favorites/index.vue index 581362aa..ea3e0403 100644 --- a/src/pages/favorites/index.vue +++ b/src/pages/favorites/index.vue @@ -51,7 +51,7 @@ import common from '@/common/common'; import useIndexList from '@/composables/useIndexList.js'; const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList(); - + const tabList = ref([ { name: '课程收藏' @@ -62,28 +62,22 @@ ]); onLoad(() => { - // 里面取消收藏后重新刷新列表 - // uni.$on('refresh_favorites_list', (params) => { - // if (params.type === 'course') { - // courseRef.value?.refreshData(params); - // } else if (params.type === 'task') { - // taskRef.value?.refreshData(params); - // } - // }); - // // 完成任务后更新列表单条信息 - // uni.$on('refresh_favorites_data', (res) => { - // console.log('列表监听里面学习完成后更新任务历程', res); - // if (tabAct.value === 0) { - // courseRef.value?.updateData(res); - // } else if (tabAct.value === 1) { - // taskRef.value?.updateData(res); - // } - // }); + uni.$on('update_tasks_item', (item) => { + setTimeout(() => { + listItemRefs.value[1]?.updateData(item); + }, 100); + }); + uni.$on('update_course_item', (item) => { + setTimeout(() => { + listItemRefs.value[0]?.reloadPage(); + }, 100); + }); }); onUnload(() => { - // uni.$off('refresh_favorites_data'); - // uni.$off('refresh_favorites_list'); + uni.$off('update_tasks_item'); + uni.$off('update_course_item'); }); +