Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

This commit is contained in:
田岩
2025-09-26 14:16:47 +08:00
3 changed files with 30 additions and 6 deletions
+4 -4
View File
@@ -15,16 +15,16 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
# VITE_APP_BASE_API_Url = 'http://25.18.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'
# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
# h5专用地址x2
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# 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 = '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_TRAASK = 'http://25.64.16.144:9605'
VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
@@ -150,6 +150,7 @@
font-size: 20rpx;
color: rgb(102,102,102);
margin-top: 6rpx;
white-space: nowrap;
}
.item-publish{
margin-top: 0rpx;
+25 -2
View File
@@ -269,7 +269,7 @@ const pageObj = ref({
total: 0
})
const getMoreList = flag => {
console.log(activeTab.value)
console.log(activeTab.value)
if (!flag) {
if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) return
pageObj.value.page += 1
@@ -295,11 +295,34 @@ const getMoreList = flag => {
})
break
case '热门':
queryCrsInfoByPopularApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = res.body || []
})
.finally(() => {
loading.value = false
})
break
case '最新':
queryCrsInfoByLastnewApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = res.body || []
})
.finally(() => {
loading.value = false
})
break
case '推荐':
queryCrsInfoByRecmdApi(pageObj.value)
queryCrsInfoByRecmdApi({
...pageObj.value,
tagId: activeTag.value.join(',')
})
.then(res => {
courseListBase.value = courseListBase.value.concat(res.body || [])
pageObj.value.total = res.total