From bfc982412b269066707f18ae03806752ff9b9fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 16:44:49 +0800 Subject: [PATCH 1/5] =?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/examRanking/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/examRanking/index.vue b/src/pages/examRanking/index.vue index 3ce91832..63a10c70 100644 --- a/src/pages/examRanking/index.vue +++ b/src/pages/examRanking/index.vue @@ -35,6 +35,7 @@ {{item.examGrade}} + 暂无数据 From 9bbd2b1df43c2f510c01356c9d63d284b212c34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 16:50:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix=20=EF=BC=9Abug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 22 +++++++++++++--------- src/pages/search/result.vue | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.env.development b/.env.development index 8d53a6b2..dec1fe92 100644 --- a/.env.development +++ b/.env.development @@ -6,25 +6,27 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786' # DEV -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 -#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7002' +#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' #VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # 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' -# sit -#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# 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' -#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001' +# sit +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91: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_TRAOSS = 'http://25.64.16.130:9702' # 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' @@ -35,4 +37,6 @@ VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' # 孙宇 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604' +# 付丙鑫 +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602' diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index 49cf01b5..87bb2d3c 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -319,6 +319,7 @@ const toCourseDetail = item => { height: 100rpx; line-height: 100rpx; color: #999; + font-size: 26rpx; } .view-tips { width: 100%; From e71ab74127072eadcd272e5f565eab692ebebc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 18:11:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=EF=BC=9Abug=E8=AF=AD=E9=9F=B3=E8=AF=BB?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/course/components/talkingItem.vue | 45 ++++++++++------- src/pages/search/result.vue | 55 ++++++++++++++++++--- 2 files changed, 76 insertions(+), 24 deletions(-) diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index f93874d6..6c6d77cd 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -31,9 +31,19 @@ + + + 参考答案：{{ dataInfo.itemAnswer }} + + + + + + + - {{ showContent }} + {{type === 5?'试题解析：':''}}{{ showContent }} @@ -53,16 +63,6 @@ - - - - - - - - - 参考答案：{{ dataInfo.itemAnswer }} - 举例：{{ dataInfo.exampie }} @@ -70,11 +70,11 @@ - + - + storageStore.audioObj) },100) }else{ voiceLoading.value = true - let _type = props.type == 2 ? 'ans' : props.type == 3 ? 'pgrh' : props.type == 4 ? 'qns' : '' - let _readId = props.type == 2 ? unref(dataInfo)?.intrctId : props.type == 3 ? unref(dataInfo)?.pgrphId : props.type == 4 ? unref(dataInfo)?.qnsId : '' + let _type = props.type == 2 ? 'ans' + : props.type == 3 ? 'pgrh' + : props.type == 4 ? 'qns' + : props.type == 5 ? 'analysis' + : props.type == 8 ? 'stemAnalysis' + : '' + let _readId = props.type == 2 ? unref(dataInfo)?.intrctId + : props.type == 3 ? unref(dataInfo)?.pgrphId + : props.type == 4 ? unref(dataInfo)?.qnsId + : props.type == 5 ? unref(dataInfo)?.qnsId + : props.type == 8 ? unref(dataInfo)?.qnsId + : '' let _params = { crsId: unref(dataInfo)?.crsId || '', pgrphId: unref(dataInfo)?.pgrphId || '', @@ -704,10 +714,10 @@ const audioCacheObj = computed(() => storageStore.audioObj) } .next-learn-btn{ float: left; - padding: 0 60rpx 0 20rpx; + padding: 0 60rpx 0 15rpx; height: 62rpx; line-height: 62rpx; - font-size: 30rpx; + font-size: 28rpx; background-color: #06f; color: #fff; border-radius: 8rpx; @@ -716,6 +726,7 @@ const audioCacheObj = computed(() => storageStore.audioObj) position: relative; &.replay-study-btn{ float: right; + margin-right: 0; } &.restart{ background-color: #eaf2ff; diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index 87bb2d3c..814dd047 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -21,14 +21,15 @@ {{ hasMore ? '滚动加载更多' : '加载完成' }} - 暂无数据 + + 暂无数据 - + @@ -58,6 +59,9 @@ + + {{ hasMore ? '滚动加载更多' : '加载完成' }} + 暂无数据 @@ -219,22 +223,29 @@ const changeTab = item => { if (!item) return activeTab.value = item.type console.log(item) - switch (item.name) { + switch (item.type) { case 'all': + pageInfo.value.limit = 3 break case 'ability': break case 'course': + pageInfo.value.limit = 15 break case 'task': + pageInfo.value.limit = 15 break case 'test': + pageInfo.value.limit = 15 break case 'exam': + pageInfo.value.limit = 15 break default: + pageInfo.value.limit = 3 break } + getData(1) } const clickAbility = item => { if (item.isTab) { @@ -262,23 +273,53 @@ const search = () => { getData(1) } +const getMore = () => { + if(activeTab.value && activeTab.value !== 'all'){ + getData() + } +} const getData = (flag = null) => { if (flag) { pageInfo.value.page = 1 courseList.value = [] + examList.value = [] + taskList.value = [] } + let _isCourse = fromType.value === 'course' || activeTab.value==='course' appSearchCrsApi({ - type: fromType.value === 'course' ? '01' : '00', //00 首页搜索 01课程搜索 + type: _isCourse ? '01' : '00', //00 首页搜索 01课程搜索 searchName: searchValue.value, page: pageInfo.value.page, limit: pageInfo.value.limit }).then(res => { - pageInfo.value.total = res.total || 0 + courseList.value = courseList.value.concat(res.body.traCrsInfoVoList || []) if (fromType.value !== 'course') { - examList.value = res.body.traExamPapersExtVoList || [] - taskList.value = res.body.traTaskInfoExtVoList || [] + examList.value = examList.value.concat(res.body.traExamPapersExtVoList || []) + taskList.value = taskList.value.concat(res.body.traTaskInfoExtVoList || []) } + + switch (activeTab.value) { + case 'all': + break + case 'ability': + break + case 'course': + pageInfo.value.total = res.total || 0 + break + case 'task': + pageInfo.value.total = res.total || 0 + break + case 'test': + pageInfo.value.total = res.total || 0 + break + case 'exam': + pageInfo.value.total = res.total || 0 + break + default: + pageInfo.value.total = res.total || 0 + break + } }) } const hasMore = computed(() => { From bc8a042217f2e2c88de5deb9555685feb71d13a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 18:40:13 +0800 Subject: [PATCH 4/5] fix :bug --- src/pages/course/index.vue | 9 +++--- src/pages/search/result.vue | 58 +++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index d164e13b..25652b4a 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -514,12 +514,13 @@ import { onShow } from "@dcloudio/uni-app" } .model-filter-list{ position: fixed; - width: 100vw; - height: 100vh; + width: calc(100vw - 33rpx); + height: 80vh; overflow: hidden; - top: 0; - left: 0; + top: 500rpx; + left: 17rpx; z-index: 1; + background-color: rgba(0,0,0,.2); } .filter-list, .model-filter-list{ diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue index 814dd047..5e3bf419 100644 --- a/src/pages/search/result.vue +++ b/src/pages/search/result.vue @@ -72,6 +72,9 @@ + + {{ hasMore ? '滚动加载更多' : '加载完成' }} + 暂无数据 @@ -90,6 +93,9 @@ + + {{ hasMore ? '滚动加载更多' : '加载完成' }} + 暂无数据 @@ -154,7 +160,7 @@ const tabList = ref([ ]) const abilityListShow = computed(() => { if (searchValue.value) { - let _arr = abilityList.value.filter(t => t.title.includes(searchValue.value)) + let _arr = abilityList.value.filter(t => t.title.includes(searchValue.value.toUpperCase())) let _sum = 4 - (_arr.length % 4) if (_sum !== 4) { for (let i = 0; i < _sum; i++) { @@ -287,39 +293,41 @@ const getData = (flag = null) => { } let _isCourse = fromType.value === 'course' || activeTab.value==='course' appSearchCrsApi({ - type: _isCourse ? '01' : '00', //00 首页搜索 01课程搜索 + type: _isCourse ? '01' + : activeTab.value==='exam' ? '02' + : activeTab.value==='task' ? '03' + : '00', //00 首页搜索 01课程搜索 '02' 考试搜索 '03' 任务搜索 searchName: searchValue.value, page: pageInfo.value.page, limit: pageInfo.value.limit }).then(res => { - courseList.value = courseList.value.concat(res.body.traCrsInfoVoList || []) if (fromType.value !== 'course') { examList.value = examList.value.concat(res.body.traExamPapersExtVoList || []) taskList.value = taskList.value.concat(res.body.traTaskInfoExtVoList || []) } - - switch (activeTab.value) { - case 'all': - break - case 'ability': - break - case 'course': - pageInfo.value.total = res.total || 0 - break - case 'task': - pageInfo.value.total = res.total || 0 - break - case 'test': - pageInfo.value.total = res.total || 0 - break - case 'exam': - pageInfo.value.total = res.total || 0 - break - default: - pageInfo.value.total = res.total || 0 - break - } + pageInfo.value.total = res.total || 0 + // switch (activeTab.value) { + // case 'all': + // break + // case 'ability': + // break + // case 'course': + // pageInfo.value.total = res.total || 0 + // break + // case 'task': + // pageInfo.value.total = res.total || 0 + // break + // case 'test': + // pageInfo.value.total = res.total || 0 + // break + // case 'exam': + // pageInfo.value.total = res.total || 0 + // break + // default: + // pageInfo.value.total = res.total || 0 + // break + // } }) } const hasMore = computed(() => { From ffc5c9e22b73add509072d6d4e7e88dbebe4138b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 2 Sep 2025 19:28:50 +0800 Subject: [PATCH 5/5] =?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 | 10 +++++----- src/api/common.js | 2 +- src/pages/course/components/talkingItem.vue | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.env.development b/.env.development index dec1fe92..f56cf4b1 100644 --- a/.env.development +++ b/.env.development @@ -17,15 +17,15 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn: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.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116: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' # 任东 -# 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_TRAOSS = 'http://25.64.16.130:9702' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604' # 张建成 @@ -38,5 +38,5 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # 孙宇 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604' # 付丙鑫 -VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602' +# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602' diff --git a/src/api/common.js b/src/api/common.js index df3c82fa..c99692f9 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -142,7 +142,7 @@ export function downloadVoiceFile(url) { }; if (token) header['summary'] = token - let baseUrl = get_base_url(); + let baseUrl = get_base_url(url); return new Promise((resolve, reject) => { uni.downloadFile({ url: `${baseUrl}${url}`, diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index 6c6d77cd..081cf3b1 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -365,6 +365,7 @@ const audioCacheObj = computed(() => storageStore.audioObj) else if(props.type === 3) return unref(dataInfo)?.chatContent || unref(dataInfo)?.pgrphContent else if(props.type === 4) return unref(dataInfo)?.chatContent || unref(dataInfo)?.qnsContent else if(props.type === 5) return unref(dataInfo)?.chatContent || unref(dataInfo)?.analyContent + else if(props.type === 8) return unref(subjectInfo)?.chatContent || unref(subjectInfo)?.qnsContent else if(props.type === 9) return unref(dataInfo)?.chatContent || unref(dataInfo)?.analyContent else if(props.type === 0) return unref(dataInfo)?.chatContent || unref(dataInfo)?.talkingContent else return unref(dataInfo)?.chatContent || unref(dataInfo)?.talkingContent