From edacc232040302189137b888a50596ada0f53195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 10:20:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E6=8C=89=E4=BD=8F=E8=AF=B4?= =?UTF-8?q?=E8=AF=9D=E7=BB=84=E4=BB=B6=E6=9B=BF=E6=8D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 10 +++++----- src/pages/course/components/touchBtn.vue | 9 ++++++--- src/pages/index/dialog.vue | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index ad663b78..9518d451 100644 --- a/.env.development +++ b/.env.development @@ -15,27 +15,27 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # h5专用地址 -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' +# 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/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index 64a6608e..69f2381e 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -16,7 +16,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -101,7 +101,8 @@ const showTalkingModel = ref(false) const keyboardIsShow = ref(false) - + const talkModelRef= ref() + watch(() => showTalkingModel.value, (val) => val ? talkModelRef.value.open() : talkModelRef.value.close()) watch(() => props.isLoading, () => {}, { deep: true, immediate: true @@ -253,6 +254,8 @@ } } // #endif + // setTimeout(()=> {talkModelRef.value.open()}, 2000) + }) // 录音结束 diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 491b990c..aff3e114 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -655,7 +655,7 @@ ...t, hotContent: t.refineContent } - }) + }).filter(t=> t.refineContent) }) } const loadData = async () => { From 48009d8f908c4fae6bc5fc60e1140e8363c9c71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 11:23:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=A0=87=E7=AD=BE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +-- src/components/course-item/course-item.vue | 7 ++- src/pages/course/index.vue | 50 ++++++++++++++++++---- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/.env.development b/.env.development index 9518d451..0b7218c4 100644 --- a/.env.development +++ b/.env.development @@ -27,15 +27,15 @@ 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_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' # 张建成 # 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/components/course-item/course-item.vue b/src/components/course-item/course-item.vue index 40e24717..a0b4dba4 100644 --- a/src/components/course-item/course-item.vue +++ b/src/components/course-item/course-item.vue @@ -9,7 +9,7 @@ {{itemInfo.crsName}} - {{item.tagName}} + {{item.tagName}} 更新：{{itemInfo.mtTime}} @@ -135,6 +135,11 @@ text-overflow: ellipsis; max-width: 200rpx; box-sizing: border-box; + &.active-tag{ + background-color: #ffa150; + color: #fff; + border: 2rpx solid #ffa150; + } } } } diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 25652b4a..814c4127 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -48,21 +48,23 @@ @@ -556,13 +558,45 @@ import { onShow } from "@dcloudio/uni-app" .tags-view{ height: 84rpx; display: block; - padding: 20rpx 120rpx 20rpx 20rpx; + padding: 15rpx 120rpx 15rpx 20rpx; box-sizing: border-box; white-space: nowrap; border-bottom: 2rpx solid #eee; .tags-item{ margin-right: 30rpx; display: inline-block; + &.active-tags-item{ + position: relative; + overflow: hidden; + border-radius: 4rpx; + overflow: hidden; + &::before{ + content: ''; + display: block; + width: 40rpx; + height: 40rpx; + position: absolute; + right: -20rpx; + bottom: -20rpx; + transform: rotateZ(-45deg); + background-color: #06f; + overflow: hidden; + z-index: 10; + } + &::after{ + content: ''; + display: block; + width: 8rpx; + height: 4rpx; + position: absolute; + right: 3rpx; + bottom: 8rpx; + transform: rotateZ(-45deg); + border-left: 1px solid #fff; + border-bottom: 1px solid #fff; + z-index: 11; + } + } ::v-deep .uv-tags{ padding: 0 20rpx; .uv-tags__text{ From 520516136480c31c60808512b4dd98219e9a0972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 14:14:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=20=E6=A0=B7=E5=BC=8Fi=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 814c4127..cf821602 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -49,9 +49,9 @@ Date: Thu, 4 Sep 2025 14:43:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E7=90=86=E5=85=AD=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- src/components/search-input/search-input.vue | 6 +- src/pages/courseDetail/index.vue | 30 +++++---- .../components/examRecordItem.vue | 2 +- .../components/practiceRecordItem.vue | 2 +- .../components/studyRecordItem.vue | 2 +- src/pages/examination/components/feedback.vue | 17 +++-- src/pages/examination/index.vue | 67 +++++++++++++------ .../components/examRecordItem.vue | 2 +- .../favorites/components/favoritesTask.vue | 9 ++- src/pages/index/index.vue | 7 +- .../learningTasks/components/content.vue | 27 +++++--- src/pages/learningTasks/details.vue | 58 ++++++++++------ src/pages/learningTasks/index.vue | 19 ++++-- src/pages/practice/index.vue | 1 - src/pages/testingHall/components/content.vue | 18 +++-- src/pages/testingHall/index.vue | 8 ++- 17 files changed, 185 insertions(+), 94 deletions(-) diff --git a/.env.development b/.env.development index ad663b78..c1c01366 100644 --- a/.env.development +++ b/.env.development @@ -19,7 +19,7 @@ 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' @@ -28,7 +28,7 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # 任东 # 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' # 张建成 diff --git a/src/components/search-input/search-input.vue b/src/components/search-input/search-input.vue index 6298fa9a..c9fdc07b 100644 --- a/src/components/search-input/search-input.vue +++ b/src/components/search-input/search-input.vue @@ -56,9 +56,13 @@ inputValue.value = newVal; } ); - + const clearText = () => { + console.log('清除搜索结果'); + inputValue.value = '' + }; const search = () => { emits('search', inputValue.value); }; + defineExpose({clearText}) diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue index ae540e68..850831fc 100644 --- a/src/pages/courseDetail/index.vue +++ b/src/pages/courseDetail/index.vue @@ -239,22 +239,29 @@ try { if (!id) { common.loading('收藏中'); - const result = await insertTraPersonalCollectionTask({ + insertTraPersonalCollectionTask({ collectTyp: '01', collectBusId: crsId.value - }); - console.log('result.body', result.body); - form.value.collectId = result.body; - - common.msg('收藏成功'); + }) + .then((result) => { + form.value.collectId = result.body; + common.msg('收藏成功'); + }) + .catch(() => { + common.hideLoading(); + }); } else { common.loading('取消收藏中'); - await deleteTraPersonalCollectionById({ + deleteTraPersonalCollectionById({ collectId: id - }); - form.value.collectId = null; - - common.msg('取消成功'); + }) + .then(() => { + form.value.collectId = null; + common.msg('取消成功'); + }) + .catch(() => { + common.hideLoading(); + }); } } catch (e) { common.hideLoading(); @@ -277,7 +284,6 @@ }); onUnload(() => { uni.$off('refresh_comment_data'); - // 如果收藏变了，并且上一页是收藏页，更新收藏列表 if (form.value.collectId !== collectId.value) { const pages = getCurrentPages(); diff --git a/src/pages/courseRecord/components/examRecordItem.vue b/src/pages/courseRecord/components/examRecordItem.vue index 4ddee29c..522958c6 100644 --- a/src/pages/courseRecord/components/examRecordItem.vue +++ b/src/pages/courseRecord/components/examRecordItem.vue @@ -26,7 +26,7 @@ :bold="true" > - 考试次数 + 考试记录 diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue index b021a6b2..9cbb1ffa 100644 --- a/src/pages/courseRecord/components/practiceRecordItem.vue +++ b/src/pages/courseRecord/components/practiceRecordItem.vue @@ -26,7 +26,7 @@ :bold="true" > - 练习次数 + 练习记录 diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue index 8a1b3721..81a78169 100644 --- a/src/pages/courseRecord/components/studyRecordItem.vue +++ b/src/pages/courseRecord/components/studyRecordItem.vue @@ -26,7 +26,7 @@ :bold="true" > - 学习次数 + 学习记录 diff --git a/src/pages/examination/components/feedback.vue b/src/pages/examination/components/feedback.vue index 9d4c5756..d701c8ed 100644 --- a/src/pages/examination/components/feedback.vue +++ b/src/pages/examination/components/feedback.vue @@ -1,5 +1,5 @@