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

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;

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