diff --git a/.env.development b/.env.development index 7c92ace5..068ce188 100644 --- a/.env.development +++ b/.env.development @@ -15,16 +15,16 @@ VITE_APP_BASE_API_Url = 'https://aitstest.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.65:7001' +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' diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue index ad8d701d..77c2d1c4 100644 --- a/src/components/course-item/course-item.vue +++ b/src/components/course-item/course-item.vue @@ -150,6 +150,7 @@ font-size: 20rpx; color: rgb(102,102,102); margin-top: 6rpx; + white-space: nowrap; } .item-publish{ margin-top: 0rpx; diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue index 3a04fe6b..2a48ae87 100644 --- a/src/pages/course/index.vue +++ b/src/pages/course/index.vue @@ -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