revert 33c22eaad9

revert 解决冲突

pages/course/index.vue

@@ -257,25 +257,29 @@ const handleFirstLevelClick = (item: string) => {
  * 获取课程分类数据
  */
 const getMedicalTags = async () => {
-  const res = await courseSubjectClassificationApi.getCourseMedicalTree()
-  if (res && res.code === 0) {
-    if (res.labels && res.labels.length > 0) {
-      curseTagList.value = res.labels
-      // 根据 currentIndex 设置初始选中的分类
-      if (res.labels[currentIndex.value]) {
-        const selectedTag = res.labels[currentIndex.value]
-        if (selectedTag.isLast === 0) {
-          // 非终极分类，显示子分类
-          if (selectedTag.children && selectedTag.children.length > 0) {
-            sbuMedicalTagsList.value = selectedTag.children
-          } else {
-            sbuMedicalTagsList.value = []
+  try {
+    const res = await courseSubjectClassificationApi.getCourseMedicalTree()
+    if (res && res.code === 0) {
+      if (res.labels && res.labels.length > 0) {
+        curseTagList.value = res.labels
+        // 根据 currentIndex 设置初始选中的分类
+        if (res.labels[currentIndex.value]) {
+          const selectedTag = res.labels[currentIndex.value]
+          if (selectedTag.isLast === 0) {
+            // 非终极分类，显示子分类
+            if (selectedTag.children && selectedTag.children.length > 0) {
+              sbuMedicalTagsList.value = selectedTag.children
+            } else {
+              sbuMedicalTagsList.value = []
+            }
           }
         }
+      } else {
+        curseTagList.value = []
       }
-    } else {
-      curseTagList.value = []
     }
+  } catch (error) {
+    console.error('获取医学课程分类失败:', error)
   }
 }
 /**
@@ -305,9 +309,13 @@ const curseClick = (item: IMedicalTag, index: number) => {
  */
 const soulCateList = ref<IMedicalTag[]>([])
 const getSoulCateList = async () => {
-  const res = await courseSubjectClassificationApi.getCourseSoulTree()
-  if (res.labels&&res.labels.length>0) {
-    soulCateList.value = res.labels;
+  try {
+    const res = await courseSubjectClassificationApi.getCourseSoulTree()
+    if (res.labels&&res.labels.length>0) {
+			soulCateList.value = res.labels;
+		}
+  } catch (error) {
+    console.error('获取心理学课程分类失败:', error)
   }
 }
 
@@ -317,9 +325,13 @@ const getSoulCateList = async () => {
  */
 const sociologyCateList = ref<IMedicalTag[]>([])
 const getSociologyCateList = async () => {
-  const res = await courseSubjectClassificationApi.getCourseSociologyTree()
-  if (res.labels&&res.labels.length>0) {
-    sociologyCateList.value = res.labels;
+  try {
+    const res = await courseSubjectClassificationApi.getCourseSociologyTree()
+    if (res.labels&&res.labels.length>0) {
+			sociologyCateList.value = res.labels;
+		}
+  } catch (error) {
+    console.error('获取国学课程分类失败:', error)
   }
 }
 
@@ -357,13 +369,17 @@ const learnList = ref<ICourse[]>([]) // 观看记录列表
  * 获取观看记录
  */
 const getLearnCourse = async () => {
-  const res = await courseApi.getUserLateCourseList()
-  if (res && res.code === 0) {
-    if (res.page && res.page.length > 0) {
-      learnList.value = res.page
-    } else {
-      learnList.value = []
+  try {
+    const res = await courseApi.getUserLateCourseList()
+    if (res && res.code === 0) {
+      if (res.page && res.page.length > 0) {
+        learnList.value = res.page
+      } else {
+        learnList.value = []
+      }
     }
+  } catch (error) {
+    console.error('获取观看记录失败:', error)
   }
 }
 
@@ -373,13 +389,17 @@ const newsList = ref<INews[]>([]) // 新闻列表
  * 获取新闻列表
  */
 const getNewsList = async () => {
-  const res = await commonApi.getMessageList(0, 1, 0)
-  if (res && res.code === 0) {
-    if (res.messages && res.messages.length > 0) {
-      newsList.value = res.messages
-    } else {
-      newsList.value = []
+  try {
+    const res = await commonApi.getMessageList(0, 1, 0)
+    if (res && res.code === 0) {
+      if (res.messages && res.messages.length > 0) {
+        newsList.value = res.messages
+      } else {
+        newsList.value = []
+      }
     }
+  } catch (error) {
+    console.error('获取新闻列表失败:', error)
   }
 }
 /**
@@ -403,17 +423,21 @@ const tryListenList = ref<ICourse[]>([]) // 试听课程列表
  * 获取试听课程列表
  */
 const getTryListenList = async () => {
-  const res = await courseApi.getMarketCourseList({
-    page: 1,
-    limit: 6,
-    id: 1
-  })
-  if (res && res.code === 0) {
-    if (res.courseList && res.courseList.records && res.courseList.records.length > 0) {
-      tryListenList.value = res.courseList.records
-    } else {
-      tryListenList.value = []
+  try {
+    const res = await courseApi.getMarketCourseList({
+      page: 1,
+      limit: 6,
+      id: 1
+    })
+    if (res && res.code === 0) {
+      if (res.courseList && res.courseList.records && res.courseList.records.length > 0) {
+        tryListenList.value = res.courseList.records
+      } else {
+        tryListenList.value = []
+      }
     }
+  } catch (error) {
+    console.error('获取试听课程失败:', error)
   }
 }