revert 33c22eaad9

revert 解决冲突

pages/book/listen/index.vue

@@ -117,20 +117,31 @@ function initScrollHeight() {
 
 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }
 
 // 加载章节列表
 async function loadChapterList() {
-  const res = await bookApi.getBookChapter({
-    bookId: bookId.value
-  })
-  
-  if (res.chapterList && res.chapterList.length > 0) {
-    chapterList.value = res.chapterList
-  } else {
+  try {
+    const res = await bookApi.getBookChapter({
+      bookId: bookId.value
+    })
+    
+    if (res.chapterList && res.chapterList.length > 0) {
+      chapterList.value = res.chapterList
+    } else {
+      nullText.value = t('common.data_null')
+    }
+  } catch (error) {
     nullText.value = t('common.data_null')
+    console.error('Failed to load chapter list:', error)
   }
 }
 

pages/book/listen/player.vue

@@ -245,8 +245,14 @@ function initAudioContext() {
 
 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  bookInfo.value = res.bookInfo
+  try {
+    const res = await bookApi.getBookInfo(bookId.value)
+    if (res.bookInfo) {
+      bookInfo.value = res.bookInfo
+    }
+  } catch (error) {
+    console.error('Failed to load book info:', error)
+  }
 }
 
 // 加载章节列表