revert 33c22eaad9

revert 解决冲突

pages/book/review.vue

@@ -164,9 +164,13 @@ function initScrollHeight() {
 
 // 加载书籍信息
 async function loadBookInfo() {
-  const res = await bookApi.getBookInfo(bookId.value)
-  if (res.bookInfo) {
-    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)
   }
 }
 
@@ -176,15 +180,20 @@ async function loadComments() {
     return
   }
   
-  const res = await bookApi.getBookComments(bookId.value, page.value.current, page.value.limit)
+  try {
+    const res = await bookApi.getBookComments(bookId.value, page.value.current, page.value.limit)
     
-  commentsCount.value = res.commentsCount || 0
-  
-  if (res.commentsTree && res.commentsTree.length > 0) {
-    commentList.value = [...commentList.value, ...res.commentsTree]
-    page.value.current += 1
-  } else if (commentList.value.length === 0) {
+    commentsCount.value = res.commentsCount || 0
+    
+    if (res.commentsTree && res.commentsTree.length > 0) {
+      commentList.value = [...commentList.value, ...res.commentsTree]
+      page.value.current += 1
+    } else if (commentList.value.length === 0) {
+      nullText.value = t('common.data_null')
+    }
+  } catch (error) {
     nullText.value = t('common.data_null')
+    console.error('Failed to load comments:', error)
   }
 }
 
@@ -266,29 +275,33 @@ function handleEmj(i: any) {
 
 // 提交评论
 async function submitComment() {
-  const content = await getEditorContent()
+  try {
+    const content = await getEditorContent()
+    
+    if (!content || content === '<p><br></p>') {
+      uni.showToast({
+        title: t('bookDetails.enterText'),
+        icon: 'none'
+      })
+      return
+    }
+    
+    const pid = replyTarget.value?.id || 0
+    await bookApi.insertComment(bookId.value, content, pid)
     
-  if (!content || content === '<p><br></p>') {
     uni.showToast({
-      title: t('bookDetails.enterText'),
-      icon: 'none'
+      title: t('workOrder.submit_success'),
+      icon: 'success',
+      duration: 500
     })
-    return
+    
+    setTimeout(() => {
+      editorCtx.value?.clear()
+      resetComments()
+    }, 500)
+  } catch (error) {
+    console.error('Failed to submit comment:', error)
   }
-  
-  const pid = replyTarget.value?.id || 0
-  await bookApi.insertComment(bookId.value, content, pid)
-  
-  uni.showToast({
-    title: t('workOrder.submit_success'),
-    icon: 'success',
-    duration: 500
-  })
-  
-  setTimeout(() => {
-    editorCtx.value?.clear()
-    resetComments()
-  }, 500)
 }
 
 // 点赞/取消点赞
@@ -301,25 +314,29 @@ async function handleLike(comment: IComment) {
     return
   }
   
-  if (comment.isLike === 0) {
-    await bookApi.likeComment(comment.id)
-    uni.showToast({
-      title: t('bookDetails.supportSuccess'),
-      icon: 'success',
-      duration: 1000
-    })
-  } else {
-    await bookApi.unlikeComment(comment.id)
-    uni.showToast({
-      title: t('bookDetails.supportCancel'),
-      icon: 'success',
-      duration: 1000
-    })
+  try {
+    if (comment.isLike === 0) {
+      await bookApi.likeComment(comment.id)
+      uni.showToast({
+        title: t('bookDetails.supportSuccess'),
+        icon: 'success',
+        duration: 1000
+      })
+    } else {
+      await bookApi.unlikeComment(comment.id)
+      uni.showToast({
+        title: t('bookDetails.supportCancel'),
+        icon: 'success',
+        duration: 1000
+      })
+    }
+    
+    setTimeout(() => {
+      resetComments()
+    }, 200)
+  } catch (error) {
+    console.error('Failed to like comment:', error)
   }
-  
-  setTimeout(() => {
-    resetComments()
-  }, 200)
 }
 
 // 删除评论
@@ -331,16 +348,20 @@ function handleDelete(comment: IComment) {
     confirmText: t('common.confirm_text'),
     success: async (res) => {
       if (res.confirm) {
-        await bookApi.deleteComment(comment.id)
-        uni.showToast({
-          title: t('bookDetails.deleteSuccess'),
-          icon: 'success',
-          duration: 500
-        })
-        
-        setTimeout(() => {
-          resetComments()
-        }, 500)
+        try {
+          await bookApi.deleteComment(comment.id)
+          uni.showToast({
+            title: t('bookDetails.deleteSuccess'),
+            icon: 'success',
+            duration: 500
+          })
+          
+          setTimeout(() => {
+            resetComments()
+          }, 500)
+        } catch (error) {
+          console.error('Failed to delete comment:', error)
+        }
       }
     }
   })