From e76e6da008a0e453dc2075b54d56ff2e5180051e Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Fri, 26 Dec 2025 11:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=9B=BE=E4=B9=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=92=8C=E8=AF=BE=E7=A8=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/course.ts                         |   2 +-
 manifest.json                                 |   4 +-
 pages.json                                    |   6 +-
 pages/book/detail.vue                         | 242 ++++++++++-----
 pages/book/index.vue                          |  26 +-
 .../details/components/CatalogueList.vue      | 291 ++++++++----------
 pages/course/details/course.vue               |  38 ++-
 pages/course/index.vue                        |  18 +-
 pages/course/list/category.vue                |  18 +-
 pages/user/index.vue                          | 217 ++++++-------
 style/tailwind.css                            |   6 -
 11 files changed, 459 insertions(+), 409 deletions(-)

diff --git a/api/modules/course.ts b/api/modules/course.ts
index 9a2502a..b8b0887 100644
--- a/api/modules/course.ts
+++ b/api/modules/course.ts
@@ -91,7 +91,7 @@ export const courseApi = {
    * @param id 目录ID
    */
   getCatalogueChapterList(id: number) {
-    return skeletonClient.request<IChapterListResponse>({
+    return mainClient.request<IChapterListResponse>({
       url: 'sociology/course/getCourseCatalogueChapterList',
       method: 'POST',
       data: { id }
diff --git a/manifest.json b/manifest.json
index 399647a..2570d9c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "吴门国际",
     "appid" : "__UNI__1250B39",
     "description" : "吴门国际",
-    "versionName" : "1.1.8",
-    "versionCode" : 118,
+    "versionName" : "1.1.10",
+    "versionCode" : 1110,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index a9072f9..f8036cd 100644
--- a/pages.json
+++ b/pages.json
@@ -3,6 +3,8 @@
 		{
 			"path": "pages/course/index",
 			"style": {
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom",
 				"navigationBarTitleText": "%index.title%"
 			}
 		}, {
@@ -23,7 +25,8 @@
 			"path": "pages/user/index",
 			"style": {
 				"navigationBarTitleText": "%user.title%",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/user/order/index",
@@ -112,6 +115,7 @@
 		}, {
 			"path": "pages/book/index",
 			"style": {
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "%book.title%"
 			}
diff --git a/pages/book/detail.vue b/pages/book/detail.vue
index a2f75e5..9ef2c8d 100644
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -3,76 +3,82 @@
     <!-- 导航栏 -->
     <nav-bar :title="$t('bookDetails.title')"></nav-bar>
     
-    <Skeleton
-      ref="bookInfoSkeleton"
-      theme="book-info"
-      class="p-3"
-      :request="[getBookInfo, getBookReadCount]"
-      @success="getBookInfoSuccess"
+    <scroll-view 
+      scroll-y 
+      class="detail-scroll"
+      :style="{ height: scrollHeight + 'px' }"
     >
-      <template #content="{ data }">
-        <!-- 书籍信息 -->
-        <view class="book-info">
-          <image :src="data.getBookInfo.bookInfo.images" class="cover" mode="aspectFill" />
-          <text class="title">{{ data.getBookInfo.bookInfo.name }}</text>
-          <text class="author">{{ $t('bookDetails.authorName') }}{{ data.getBookInfo.bookInfo.author?.authorName }}</text>
-          
-          <!-- 统计信息 -->
-          <view class="stats">
-            <view class="stat-item">
-              <image src="@/static/icon/icon_look_c.png" mode="aspectFit" />
-              <text>{{ data.getBookReadCount.readCount }}{{ $t('bookHome.readingCount') }}</text>
-            </view>
-            <view class="divider" />
-            <view class="stat-item">
-              <image src="@/static/icon/icon_listen_c.png" mode="aspectFit" />
-              <text>{{ data.getBookReadCount.listenCount }}{{ $t('bookHome.listenCount') }}</text>
-            </view>
-            <view class="divider" />
-            <view class="stat-item">
-              <image src="@/static/icon/icon_bug_c.png" mode="aspectFit" />
-              <text>{{ data.getBookReadCount.buyCount }}{{ $t('bookHome.purchased') }}</text>
-            </view>
+      <!-- 书籍信息 -->
+      <view class="book-info">
+        <image :src="bookInfo.images" class="cover" mode="aspectFill" />
+        <text class="title">{{ bookInfo.name }}</text>
+        <text class="author">{{ $t('bookDetails.authorName') }}{{ bookInfo.author?.authorName }}</text>
+        
+        <!-- 统计信息 -->
+        <view class="stats">
+          <view class="stat-item">
+            <image src="@/static/icon/icon_look_c.png" mode="aspectFit" />
+            <text>{{ readCount }}{{ $t('bookHome.readingCount') }}</text>
+          </view>
+          <view class="divider" />
+          <view class="stat-item">
+            <image src="@/static/icon/icon_listen_c.png" mode="aspectFit" />
+            <text>{{ listenCount }}{{ $t('bookHome.listenCount') }}</text>
+          </view>
+          <view class="divider" />
+          <view class="stat-item">
+            <image src="@/static/icon/icon_bug_c.png" mode="aspectFit" />
+            <text>{{ buyCount }}{{ $t('bookHome.purchased') }}</text>
           </view>
         </view>
-        
-        <!-- 简介 -->
-        <view class="introduction">
-          <text class="section-title">{{ $t('bookDetails.introduction') }}</text>
-          <text class="content">{{ data.getBookInfo.bookInfo.author?.introduction }}</text>
+      </view>
+      
+      <!-- 简介 -->
+      <view class="introduction">
+        <text class="section-title">{{ $t('bookDetails.introduction') }}</text>
+        <text class="content">{{ bookInfo.author?.introduction }}</text>
+      </view>
+      
+      <!-- 书评列表 (非iOS) -->
+      <!-- <view v-if="!isIOS" class="comments-section">
+        <view class="section-header">
+          <text class="section-title">{{ $t('bookDetails.message') }}</text>
+          <view v-if="commentList.length > 0" class="more-link" @click="goToReview">
+            <text>{{ $t('bookDetails.more') }}</text>
+            <wd-icon name="arrow-right" size="14px" />
+          </view>
         </view>
-      </template>
-    </Skeleton>
+        <view class="comment-wrapper">
+          <CommentList 
+            v-if="commentList.length > 0"
+            :comments="commentList.slice(0, 2)" 
+          />
+          <text v-else class="empty-text">{{ nullText }}</text>
+        </view>
+      </view> -->
       
-    <!-- 相关推荐 -->
-    <view class="related-books">
-      <text class="section-title">{{ $t('bookDetails.relatedBooks') }}</text>
-      <Skeleton
-        theme="image-card"
-        :size="Array(4).fill({ height: '100px', width: '23%' })"
-        :request="getRecommendBook"
-      >
-        <template #content="{ data }">
-          <scroll-view v-if="data.bookList.length > 0" scroll-x class="book-scroll">
-            <view class="book-list">
-              <view 
-                class="book-item" 
-                v-for="item in data.bookList" 
-                :key="item.id"
-                @click="goToDetail(item.id)"
-              >
-                <image :src="item.images" mode="aspectFill" />
-                <text>{{ item.name }}</text>
-              </view>
+      <!-- 相关推荐 -->
+      <view class="related-books">
+        <text class="section-title">{{ $t('bookDetails.relatedBooks') }}</text>
+        <scroll-view v-if="relatedBooks.length > 0" scroll-x class="book-scroll">
+          <view class="book-list">
+            <view 
+              class="book-item" 
+              v-for="item in relatedBooks" 
+              :key="item.id"
+              @click="goToDetail(item.id)"
+            >
+              <image :src="item.images" mode="aspectFill" />
+              <text>{{ item.name }}</text>
             </view>
-          </scroll-view>
-          <text v-else class="empty-text">{{ $t('common.data_null') }}</text>
-        </template>
-      </Skeleton>
-    </view>
-      
+          </view>
+        </scroll-view>
+        <text v-else class="empty-text">{{ nullBookText }}</text>
+      </view>
+    </scroll-view>
+    
     <!-- 底部操作栏 -->
-    <view v-if="bookInfoLoading" class="action-bar">
+    <view class="action-bar">
       <template v-if="bookInfo.isBuy || hasVip">
         <view class="action-btn read" @click="goToReader">
           <text>{{ $t('bookDetails.startReading') }}</text>
@@ -114,12 +120,13 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
+import { t } from '@/utils/i18n'
 import { bookApi } from '@/api/modules/book'
 import { useUserStore } from '@/stores/user'
-import type { IBookDetail } from '@/types/book'
+import type { IBookDetail, IBook, IComment } from '@/types/book'
 import type { IGoods } from '@/types/order'
 import GoodsSelector from '@/components/order/GoodsSelector.vue'
-import Skeleton from '@/components/Skeleton/Skeleton.vue'
+import CommentList from '@/components/book/CommentList.vue'
 
 const userStore = useUserStore()
 
@@ -131,8 +138,6 @@ const pageFrom = ref('')
 const hasVip = computed(() => userStore.userInfo?.userEbookVip?.length > 0 || false)
 
 // 数据状态
-const bookInfoSkeleton = ref()
-const bookInfoLoading = ref(false)
 const bookInfo = ref<IBookDetail>({
   id: 0,
   name: '',
@@ -142,7 +147,23 @@ const bookInfo = ref<IBookDetail>({
   freeChapterCount: 0
 })
 const goodsList = ref<IGoods[]>([])
+const readCount = ref(0)
+const listenCount = ref(0)
+const buyCount = ref(0)
+const commentList = ref<IComment[]>([])
+const relatedBooks = ref<IBook[]>([])
+const nullText = ref('')
+const nullBookText = ref('')
 const purchaseVisible = ref(false)
+const scrollHeight = ref(0)
+
+// 计算属性
+const isIOS = computed(() => {
+  // #ifdef APP-PLUS
+  return uni.getSystemInfoSync().platform === 'ios'
+  // #endif
+  return false
+})
 
 // 生命周期
 onLoad((options: any) => {
@@ -152,23 +173,45 @@ onLoad((options: any) => {
   if (options.page) {
     pageFrom.value = options.page
   }
+  
+  initScrollHeight()
+  loadBookCount()
+  loadRecommendBooks()
 })
 
 onShow(() => {
-  bookInfoSkeleton.value?.reload()
+  loadBookInfo()
+  loadGoodsInfo()
+  if (!isIOS.value) {
+    loadComments()
+  }
 })
 
+onMounted(() => {
+  initScrollHeight()
+})
+
+// 初始化滚动区域高度
+function initScrollHeight() {
+  const systemInfo = uni.getSystemInfoSync()
+  const statusBarHeight = systemInfo.statusBarHeight || 0
+  let navBarHeight = 44
+  if (systemInfo.model.includes('iPhone')) {
+    const modelNumber = parseInt(systemInfo.model.match(/\d+/)?.[0] || '0')
+    if (modelNumber >= 11) {
+      navBarHeight = 48
+    }
+  }
+  const totalNavHeight = statusBarHeight + navBarHeight
+  const actionBarHeight = 110 // rpx转px约55
+  scrollHeight.value = systemInfo.windowHeight - totalNavHeight - actionBarHeight / 2
+}
 
 // 加载书籍详情
-const getBookInfo = () => bookApi.getBookInfo(bookId.value)
-const getBookInfoSuccess = (res: any) => {
-  bookInfoLoading.value = true
-  bookInfo.value = res.getBookInfo.bookInfo || {}
+async function loadBookInfo() {
+  const res = await bookApi.getBookInfo(bookId.value)
+  bookInfo.value = res.bookInfo
 }
-// 加载统计数据
-const getBookReadCount = () => bookApi.getBookReadCount(bookId.value)
-// 加载推荐书籍
-const getRecommendBook = () => bookApi.getRecommendBook(bookId.value)
 
 // 加载购买商品信息
 async function loadGoodsInfo() {
@@ -176,9 +219,38 @@ async function loadGoodsInfo() {
   goodsList.value = res.productList || []
 }
 
+// 加载统计数据
+async function loadBookCount() {
+  const res = await bookApi.getBookReadCount(bookId.value)
+  if (res.code === 0) {
+    readCount.value = res.readCount || 0
+    listenCount.value = res.listenCount || 0
+    buyCount.value = res.buyCount || 0
+  }
+}
+
+// 加载评论
+async function loadComments() {
+  const res = await bookApi.getBookComments(bookId.value, 1, 10)
+  if (res.commentsTree && res.commentsTree.length > 0) {
+    commentList.value = res.commentsTree
+  } else {
+    nullText.value = t('common.data_null')
+  }
+}
+
+// 加载推荐书籍
+async function loadRecommendBooks() {
+  const res = await bookApi.getRecommendBook(bookId.value)
+  if (res.bookList && res.bookList.length > 0) {
+    relatedBooks.value = res.bookList
+  } else {
+    nullBookText.value = t('common.data_null')
+  }
+}
+
 // 显示购买弹窗
-async function showPurchasePopup() {
-  await loadGoodsInfo()
+function showPurchasePopup() {
   purchaseVisible.value = true
 }
 
@@ -209,6 +281,12 @@ function goToListen() {
   })
 }
 
+function goToReview() {
+  uni.navigateTo({
+    url: `/pages/book/review?bookId=${bookId.value}&page=0`
+  })
+}
+
 function goToDetail(id: number) {
   uni.navigateTo({
     url: `/pages/book/detail?id=${id}`
@@ -223,7 +301,7 @@ function goToDetail(id: number) {
   
   .book-info {
     text-align: center;
-    padding-bottom: 40rpx;
+    padding: 40rpx 30rpx;
     
     .cover {
       width: 300rpx;
@@ -281,7 +359,9 @@ function goToDetail(id: number) {
     }
   }
   
-  .introduction {    
+  .introduction {
+    padding: 40rpx 30rpx 0;
+    
     .section-title {
       display: block;
       font-size: 34rpx;
@@ -330,7 +410,7 @@ function goToDetail(id: number) {
   }
   
   .related-books {
-    padding: 0rpx 30rpx calc(40rpx + 110rpx);
+    padding: 40rpx 30rpx 40rpx;
     
     .section-title {
       display: block;
diff --git a/pages/book/index.vue b/pages/book/index.vue
index b851df6..ff384c1 100644
--- a/pages/book/index.vue
+++ b/pages/book/index.vue
@@ -1,11 +1,12 @@
 <template>
-  <scroll-view 
+  <!-- <scroll-view 
       class="home-page" 
       scroll-y 
       refresher-enabled 
       :refresher-triggered="isRefreshing"
       @refresherrefresh="handleRefresh"
-    >
+    > -->
+  <view class="home-page">
     <!-- 顶部背景区域 -->
     <view class="home-bg" :style="{ paddingTop: getNotchHeight() + 'px' }">
       <wd-search
@@ -250,12 +251,12 @@
         </Skeleton>
       </view>
     </view>
-  </scroll-view>
+  </view>
 </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
+import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
 import { bookHomeApi } from '@/api/modules/book_home'
 import { getNotchHeight } from '@/utils/system'
 import { useUserStore } from '@/stores/user'
@@ -433,14 +434,10 @@ const getPrompt = () => {
  }
 }
 
-// 下拉刷新状态
-const isRefreshing = ref(false)
 /**
- * 处理下拉刷新
+ * 刷新页面数据
  */
 const handleRefresh = async () => {
-  isRefreshing.value = true
-  
   try {
     // 刷新所有数据
     await Promise.all([
@@ -453,18 +450,25 @@ const handleRefresh = async () => {
   } finally {
     // 延迟关闭刷新状态，避免闪烁
     setTimeout(() => {
-      isRefreshing.value = false
+      uni.stopPullDownRefresh();
     }, 500)
   }
 }
 
+/**
+ * 下拉刷新
+ */
+onPullDownRefresh(() => {
+  handleRefresh()
+})
+
 /**
  * 页面显示
  */
 onShow(() => {
   // 刷新数据
   myBookSkeleton.value?.reload()
-  categoryLevel1LabelSkeleton.value.reload()
+  categoryLevel1LabelSkeleton.value?.reload()
 })
 </script>
 
diff --git a/pages/course/details/components/CatalogueList.vue b/pages/course/details/components/CatalogueList.vue
index f904f2f..a9161a5 100644
--- a/pages/course/details/components/CatalogueList.vue
+++ b/pages/course/details/components/CatalogueList.vue
@@ -1,147 +1,135 @@
 <template>
-  <view>
-    <Skeleton ref="skeleton" theme="line-list" :request="[getChapters, checkRenewPayment]" :auto="false" @success="getDataSuccess">
-      <template #loading-top>
-        <wd-skeleton :row-col="[
-          [{ width: '45%', height: '35px' }, { width: '45%', height: '35px' }],
-          [{ width: '100%', height: '90px' }]
-        ]" animation="gradient" class="mb-2.5! mt-5!" />
-      </template>
-      <template #content>
-        <view class="course-content-wrapper">
-          <view 
-            v-if="catalogues.length > 1" 
-            :class="['catalogue-list', userVip ? 'vip-style' : '']"
-          >
-            <view
-              v-for="(catalogue, index) in catalogues"
-              :key="catalogue.id"
-              :class="['catalogue-item', currentCatalogueIndex === index ? 'active' : '']"
-              @click="handleSelect(index)"
-            >
-              <text class="catalogue-title">{{ catalogue.title }}</text>
-            </view>
-          </view>
+  <view class="course-content-wrapper">
+    <view 
+      v-if="catalogues.length > 1" 
+      :class="['catalogue-list', userVip ? 'vip-style' : '']"
+    >
+      <view
+        v-for="(catalogue, index) in catalogues"
+        :key="catalogue.id"
+        :class="['catalogue-item', currentCatalogueIndex === index ? 'active' : '']"
+        @click="handleSelect(index)"
+      >
+        <text class="catalogue-title">{{ catalogue.title }}</text>
+      </view>
+    </view>
 
-          <view class="chapter-list">
-            <!-- 目录状态信息 -->
-            <view class="catalogue-status">
-              <view v-if="currentCatalogue?.isBuy === 1 || userVip" class="purchased-info">
-                <view class="info-row">
-                  <text v-if="userVip">
-                    VIP畅学权益有效期截止到：{{ userVip.endTime }}
-                  </text>
-                  <template v-else>
-                    <text v-if="!currentCatalogue.startTime">
-                      当前目录还未开始学习
-                    </text>
-                    <text v-else>
-                      课程有效期截止到：{{ currentCatalogue.endTime }}
-                    </text>
-                    <!-- <wd-button 
-                      v-if="currentCatalogue.startTime"
-                      size="small"
-                      @click="handleRenew"
-                    >
-                      续费
-                    </wd-button> -->
-                  </template>
-                </view>
-              </view>
-              
-              <!-- 未购买状态 -->
-              <view v-else-if="currentCatalogue?.type === 0" class="free-course">
-                <wd-button type="success" @click="handleGetFreeCourse">
-                  {{ $t('courseDetails.free') }}
-                </wd-button>
-              </view>
-              
-              <view v-else class="unpurchased-info">
-                <text class="tip-text">
-                  {{ $t('courseDetails.unpurchasedTip') }}
-                </text>
-                <view class="action-btns">
-                  <wd-button size="small" type="warning" @click="handlePurchase">
-                    {{ $t('courseDetails.purchase') }}
-                  </wd-button>
-                  <!-- 如果是复读显示复读按钮 -->
-                  <wd-button v-if="canRenlearn" size="small" type="success" @click="handleRenlearn">
-                    {{ $t('courseDetails.relearn') }}
-                  </wd-button>
-                  <wd-button size="small" type="primary" @click="goToVip">
-                    {{ $t('courseDetails.openVip') }}
-                  </wd-button>
-                </view>
-              </view>
-            </view>
-
-            <view v-if="chapterList.length > 0" class="chapter-content">
-              <!-- VIP标识 -->
-              <view v-if="userVip" class="vip-badge">
-                <text>VIP畅学权益生效中</text>
-              </view>
-              
-              <!-- 章节列表 -->
-              <view
-                v-for="(chapter, index) in chapterList"
-                :key="chapter.id"
-                class="chapter-item"
-                @click="handleChapterClick(chapter)"
+    <view class="chapter-list">
+      <!-- 目录状态信息 -->
+      <view class="catalogue-status">
+        <view v-if="currentCatalogue?.isBuy === 1 || userVip" class="purchased-info">
+          <view class="info-row">
+            <text v-if="userVip">
+              VIP畅学权益有效期截止到：{{ userVip.endTime }}
+            </text>
+            <template v-else>
+              <text v-if="!currentCatalogue.startTime">
+                当前目录还未开始学习
+              </text>
+              <text v-else>
+                课程有效期截止到：{{ currentCatalogue.endTime }}
+              </text>
+              <!-- <wd-button 
+                v-if="currentCatalogue.startTime"
+                size="small"
+                @click="handleRenew"
               >
-                <view class="chapter-content-wrapper">
-                  <view :class="['chapter-info', !canAccess(chapter) ? 'locked' : '']">
-                    <text class="chapter-title">{{ chapter.title }}</text>
-                    
-                    <!-- 试听标签 -->
-                    <wd-tag
-                      v-if="chapter.isAudition === 1 && !isPurchased && !userVip"
-                      type="success"
-                      plain
-                      size="small"
-                      custom-class="chapter-tag"
-                    >
-                      试听
-                    </wd-tag>
-                    
-                    <!-- 学习状态标签 -->
-                    <template v-if="isPurchased || userVip">
-                      <wd-tag
-                        v-if="chapter.isLearned === 0"
-                        type="primary"
-                        plain
-                        size="small"
-                        custom-class="chapter-tag"
-                      >
-                        未学
-                      </wd-tag>
-                      <wd-tag
-                        v-else
-                        type="success"
-                        plain
-                        size="small"
-                        custom-class="chapter-tag"
-                      >
-                        已学
-                      </wd-tag>
-                    </template>
-                  </view>
-                  
-                  <!-- 锁定图标 -->
-                  <view v-if="!canAccess(chapter) && currentCatalogue.type != 0" class="lock-icon">
-                    <wd-icon name="lock-on" size="24px" color="#258feb" />
-                  </view>
-                </view>
-              </view>
+                续费
+              </wd-button> -->
+            </template>
+          </view>
+        </view>
+        
+        <!-- 未购买状态 -->
+        <view v-else-if="currentCatalogue?.type === 0" class="free-course">
+          <wd-button type="success" @click="handleGetFreeCourse">
+            {{ $t('courseDetails.free') }}
+          </wd-button>
+        </view>
+        
+        <view v-else class="unpurchased-info">
+          <text class="tip-text">
+            {{ $t('courseDetails.unpurchasedTip') }}
+          </text>
+          <view class="action-btns">
+            <wd-button size="small" type="warning" @click="handlePurchase">
+              {{ $t('courseDetails.purchase') }}
+            </wd-button>
+            <!-- 如果是复读显示复读按钮 -->
+            <wd-button v-if="canRenlearn" size="small" type="success" @click="handleRenlearn">
+              {{ $t('courseDetails.relearn') }}
+            </wd-button>
+            <wd-button size="small" type="primary" @click="goToVip">
+              {{ $t('courseDetails.openVip') }}
+            </wd-button>
+          </view>
+        </view>
+      </view>
+
+      <view v-if="chapterList.length > 0" class="chapter-content">
+        <!-- VIP标识 -->
+        <view v-if="userVip" class="vip-badge">
+          <text>VIP畅学权益生效中</text>
+        </view>
+        
+        <!-- 章节列表 -->
+        <view
+          v-for="(chapter, index) in chapterList"
+          :key="chapter.id"
+          class="chapter-item"
+          @click="handleChapterClick(chapter)"
+        >
+          <view class="chapter-content-wrapper">
+            <view :class="['chapter-info', !canAccess(chapter) ? 'locked' : '']">
+              <text class="chapter-title">{{ chapter.title }}</text>
+              
+              <!-- 试听标签 -->
+              <wd-tag
+                v-if="chapter.isAudition === 1 && !isPurchased && !userVip"
+                type="success"
+                plain
+                size="small"
+                custom-class="chapter-tag"
+              >
+                试听
+              </wd-tag>
+              
+              <!-- 学习状态标签 -->
+              <template v-if="isPurchased || userVip">
+                <wd-tag
+                  v-if="chapter.isLearned === 0"
+                  type="primary"
+                  plain
+                  size="small"
+                  custom-class="chapter-tag"
+                >
+                  未学
+                </wd-tag>
+                <wd-tag
+                  v-else
+                  type="success"
+                  plain
+                  size="small"
+                  custom-class="chapter-tag"
+                >
+                  已学
+                </wd-tag>
+              </template>
             </view>
             
-            <!-- 暂无章节 -->
-            <view v-else class="no-chapters">
-              <text>暂无章节内容</text>
+            <!-- 锁定图标 -->
+            <view v-if="!canAccess(chapter) && currentCatalogue.type != 0" class="lock-icon">
+              <wd-icon name="lock-on" size="24px" color="#258feb" />
             </view>
           </view>
         </view>
-      </template>
-    </Skeleton>
+      </view>
+      
+      <!-- 暂无章节 -->
+      <view v-else class="no-chapters">
+        <text>暂无章节内容</text>
+      </view>
+    </view>
 
     <!-- 商品选择器 -->
     <GoodsSelector
@@ -159,15 +147,12 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
 import { courseApi } from '@/api/modules/course'
 import GoodsSelector from '@/components/order/GoodsSelector.vue'
 import Protocol from './Protocol.vue'
 import type { IChapter, ICatalogue, IVipInfo } from '@/types/course'
 import type { IGoods } from '@/types/order'
 
-const skeleton = ref()
-
 interface Props {
   catalogues: ICatalogue[]
   userVip: IVipInfo | null
@@ -222,43 +207,33 @@ const handleSelect = (index: number) => {
 /**
  * 获取当前目录的章节
  */
-const getChapters = () => courseApi.getCatalogueChapterList(currentCatalogue.value.id)
+const getChapters = async () => {
+  const res = await courseApi.getCatalogueChapterList(currentCatalogue.value.id)
+  chapterList.value = res.chapterList || []
+}
 
 /**
  * 检查目录是否支持复读
  */
 const checkRenewPayment = async () => {
   if (currentCatalogue.value.isBuy === 0 && !props.userVip) {
-    return courseApi.checkRenewPayment(currentCatalogue.value.id)
+    const renewRes = await courseApi.checkRenewPayment(currentCatalogue.value.id)
+    canRenlearn.value = renewRes.canRelearn || false
   } else {
-    return null
+    canRenlearn.value = false
   }
 }
 
-/**
- * 获取数据完成后处理
- */
-const getDataSuccess = (res: any) => {
-  const { getChapters, checkRenewPayment } = res
-  chapterList.value = getChapters.chapterList || []
-  canRenlearn.value = checkRenewPayment.canRelearn || false
-}
-
 /**
  * 监听目录变化
  */
 watch(() => props.catalogues, (newVal: ICatalogue[]) => {
   if (newVal.length > 0) {
     currentCatalogueIndex.value = 0
-    skeleton.value.reload()
+    getChapters()
+    checkRenewPayment()
   }
 }, { immediate: true, deep: true })
-/**
- * 刷新章节数据
- */
-onShow(async () => {
-  skeleton.value && skeleton.value.reload()
-})
 
 // 购买
 const handlePurchase = async () => {
diff --git a/pages/course/details/course.vue b/pages/course/details/course.vue
index 6031604..4ec91c9 100644
--- a/pages/course/details/course.vue
+++ b/pages/course/details/course.vue
@@ -13,14 +13,11 @@
     </view>
 
     <!-- 课程信息 -->
-    <Skeleton theme="image-text" :request="getCourseDetail" @success="getCourseDetailSuccess">
-      <template #content>
-        <CourseInfo v-if="courseDetail" :course="courseDetail" :class="{'pt-10': !!vipTip}" />
-      </template>
-    </Skeleton>
+    <CourseInfo v-if="courseDetail" :course="courseDetail" :class="{'pt-10': !!vipTip}" />
 
     <!-- 课程内容包装器 -->
     <CatalogueList
+      v-if="catalogueList.length > 0"
       :catalogues="catalogueList"
       :userVip="userVip"
       @toVip="goToVip"
@@ -180,29 +177,38 @@ const vipTip = computed(() => {
  */
 onLoad(async (options: any) => {
   courseId.value = parseInt(options.id)
-  loadPageData()
+})
+
+/**
+ * 页面显示
+ */
+onShow(async () => {
+  await loadPageData()
 })
 
 /**
  * 加载页面数据
  */
-const getCourseDetail = () => courseApi.getCourseDetail(courseId.value)
-const getCourseDetailSuccess = async (res: any) => {
+const loadPageData = async () => {
+  // 获取课程详情
+  const res = await courseApi.getCourseDetail(courseId.value)
   if (res.code === 0 && res.data) {
     courseDetail.value = res.data.course
     catalogueList.value = res.data.catalogues || []
     relatedBooks.value = res.data.shopProductList || []
-
+    
     // 计算学习进度
     if (catalogueList.value.length > 0) {
       const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
       learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
     }
   }
-}
-const loadPageData = async () => {
+  
   // 检查VIP权益
   await checkVipStatus()
+  
+  // 加载评论
+  await loadComments()
 }
 
 /**
@@ -442,11 +448,11 @@ onPullDownRefresh(async () => {
 /**
  * 触底加载
  */
-// onReachBottom(() => {
-//   if (hasMoreComments.value && !commentsLoading.value) {
-//     loadComments()
-//   }
-// })
+onReachBottom(() => {
+  if (hasMoreComments.value && !commentsLoading.value) {
+    loadComments()
+  }
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/course/index.vue b/pages/course/index.vue
index a4bc821..138db14 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -1,11 +1,5 @@
 <template>
-  <scroll-view 
-    class="course-home-page" 
-    scroll-y 
-    refresher-enabled 
-    :refresher-triggered="isRefreshing"
-    @refresherrefresh="handleRefresh"
-  >
+  <view class="course-home-page">
     <!-- 头部区域 -->
     <view class="home-bg" :style="{ paddingTop: getNotchHeight() + 'px' }">
       <wd-search
@@ -221,7 +215,7 @@
         </template>
       </Skeleton>
     </view>
-  </scroll-view>
+  </view>
 </template>
 
 <script setup lang="ts">
@@ -472,8 +466,6 @@ const requestAll = async () => {
  * 处理下拉刷新
  */
 const handleRefresh = async () => {
-  isRefreshing.value = true
-  
   try {
     // 刷新所有数据
     await requestAll()
@@ -482,7 +474,7 @@ const handleRefresh = async () => {
   } finally {
     // 延迟关闭刷新状态，避免闪烁
     setTimeout(() => {
-      isRefreshing.value = false
+      uni.stopPullDownRefresh()
     }, 500)
   }
 }
@@ -535,9 +527,7 @@ onHide(() => {
  * 下拉刷新
  */
 onPullDownRefresh(() => {
-  requestAll().then(() => {
-    uni.stopPullDownRefresh()
-  })
+  handleRefresh()
 })
 
 /**
diff --git a/pages/course/list/category.vue b/pages/course/list/category.vue
index f547157..03f9ea2 100644
--- a/pages/course/list/category.vue
+++ b/pages/course/list/category.vue
@@ -11,7 +11,12 @@
 
     <!-- 子级分类 -->
     <view v-if="selectedTab && selectedTab.children && selectedTab.children.length > 0" class="sub-category-list">
-      <view v-for="child in selectedTab.children" :key="child.id" :class="{'active': child.id === radio_category_id}" class="sub-category-child-item">{{ child.title }}</view>
+      <view
+        v-for="child in selectedTab.children"
+        :key="child.id" :class="{'active': child.id === radio_category_id}"
+         class="sub-category-child-item"
+         @click="changeRadioCategoryId(child.id)"
+        >{{ child.title }}</view>
     </view>
 
     <!-- 课程列表 -->
@@ -86,6 +91,17 @@ const changeCategory = ({ name }: { name: number}) => {
   radio_category_id.value = selectedTab.value && selectedTab.value.children[0] && selectedTab.value.children[0].id || 0
 }
 
+/**
+ * 子级分类切换
+ */
+const changeRadioCategoryId = (id: number) => {
+  radio_category_id.value = id
+  // 重新加载分页数据
+  paging.value && paging.value.reload();
+}
+
+
+
 // 分类下的课程列表
 const courseList = ref<ICourse[]>([]) // 课程列表
 const selectedCategoryId = computed(() => {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 18c11cc..5ecc07f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,91 +1,83 @@
 <template>		
-	<scroll-view
-		scroll-y 
-		refresher-enabled 
-		:refresher-triggered="isRefreshing"
-		@refresherrefresh="handleRefresh"
-		v-if="tokenState"
-	>
-		<view class="user-page" :style="{ paddingTop: getNotchHeight() + 30 + 'px' }" v-if="tokenState">
-			<!-- 设置图标 -->
-			<view class="settings-icon" :style="{ top: getNotchHeight() + 30 + 'px' }" @click="goSettings">
-				<wd-icon name="setting1" size="24px" color="#666" />
-				<text>{{ $t('user.settings') }}</text>
-			</view>
+	<view class="user-page" :style="{ paddingTop: getNotchHeight() + 30 + 'px' }" v-if="tokenState">
+		<!-- 设置图标 -->
+		<view class="settings-icon" :style="{ top: getNotchHeight() + 30 + 'px' }" @click="goSettings">
+			<wd-icon name="setting1" size="24px" color="#666" />
+			<text>{{ $t('user.settings') }}</text>
+		</view>
 
-			<!-- 用户信息区域 -->
-			<view class="user-info-section">
-				<view class="user-info">
-					<image :src="userInfo.avatar || defaultAvatar" class="avatar" @click="goProfile" />
-					<view class="user-details">
-						<text class="nickname">{{ userInfo.nickname || $t('user.notSet') }}</text>
-						<text v-if="userInfo.email" class="email">{{ userInfo.email }}</text>
-					</view>
+		<!-- 用户信息区域 -->
+		<view class="user-info-section">
+			<view class="user-info">
+				<image :src="userInfo.avatar || defaultAvatar" class="avatar" @click="goProfile" />
+				<view class="user-details">
+					<text class="nickname">{{ userInfo.nickname || $t('user.notSet') }}</text>
+					<text v-if="userInfo.email" class="email">{{ userInfo.email }}</text>
 				</view>
 			</view>
-
-			<!-- VIP订阅卡片 -->
-			<view class="vip-card-section">
-				<view class="vip-card">
-					<view class="vip-card-title">{{ $t('user.vip') }}</view>
-					<view class="vip-card-content">
-						<view class="vip-item-list">
-							<view v-if="vipInfo?.length > 0" v-for="vip in vipInfo">
-								{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
-							<view v-else>办理课程VIP，畅享更多权益</view>
-						</view>
-						<wd-button v-if="vipInfo?.length > 0" plain type="primary" size="small"
-							@click="goCourseVipSub">{{ $t('vip.renewal') }}</wd-button>
-						<wd-button v-else plain type="primary" size="small"
-							@click="goCourseVipSub">{{ $t('vip.openVip') }}</wd-button>
-					</view>
-					<view class="vip-card-content">
-						<view class="vip-item-list">
-							<view v-if="vipInfoEbook?.length > 0" v-for="vip in vipInfoEbook">
-								电子书VIP{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
-							<view v-else>办理电子书VIP，畅享更多权益</view>
-						</view>
-						<wd-button v-if="!vipInfoEbook?.length" plain type="primary" size="small"
-							@click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
-					</view>
-				</view>
-			</view>
-
-			<!-- 我的资产 -->
-			<view class="assets-card-section wallet-section">
-				<view class="assets-card wallet_l">
-					<view class="assets">
-						<view @click="goVirtualList">
-							<view class="assets_row">{{ t('global.coin') }}</view>
-							<view>{{userInfo.peanutCoin ?? 1}}</view>
-						</view>
-						<view @click="goPointsList">
-							<view class="assets_row">积分</view>
-							<view>{{userInfo.jf ?? 1}}</view>
-						</view>
-						<!-- <view>
-							<view class="assets_row">优惠卷</view>
-							<view>0</view>
-						</view> -->
-					</view>
-					<view class="chong_btn" @click="goRecharge">充 值</view>
-					<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
-					<text class="wallet_count">{{userMes.peanutCoin}}</text> -->
-				</view>
-			</view>
-
-			<!-- 功能菜单列表 -->
-			<view class="menu-section">
-				<wd-cell-group border class="menu-list">
-					<wd-cell v-for="item in menuItems" :key="item.id" :title="item.name" :label="item.desc" is-link
-						@click="handleMenuClick(item)">
-						<text v-if="item.hufenState" class="menu-list-hufen">{{hufenData?.total ?? 0}}<text
-								style="margin-left: 6rpx;">湖分</text></text>
-					</wd-cell>
-				</wd-cell-group>
-			</view>
 		</view>
-	</scroll-view>
+
+		<!-- VIP订阅卡片 -->
+		<view class="vip-card-section">
+			<view class="vip-card">
+				<view class="vip-card-title">{{ $t('user.vip') }}</view>
+				<view class="vip-card-content">
+					<view class="vip-item-list">
+						<view v-if="vipInfo?.length > 0" v-for="vip in vipInfo">
+							{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
+						<view v-else>办理课程VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="vipInfo?.length > 0" plain type="primary" size="small"
+						@click="goCourseVipSub">{{ $t('vip.renewal') }}</wd-button>
+					<wd-button v-else plain type="primary" size="small"
+						@click="goCourseVipSub">{{ $t('vip.openVip') }}</wd-button>
+				</view>
+				<view class="vip-card-content">
+					<view class="vip-item-list">
+						<view v-if="vipInfoEbook?.length > 0" v-for="vip in vipInfoEbook">
+							电子书VIP{{ vipTypeDict[vip.type] }}（{{ parseTime(vip.endTime, '{y}-{m}-{d}') }} 截止）</view>
+						<view v-else>办理电子书VIP，畅享更多权益</view>
+					</view>
+					<wd-button v-if="!vipInfoEbook?.length" plain type="primary" size="small"
+						@click="goSubscribe">{{ $t('vip.openVip') }}</wd-button>
+				</view>
+			</view>
+		</view>
+
+		<!-- 我的资产 -->
+		<view class="assets-card-section wallet-section">
+			<view class="assets-card wallet_l">
+				<view class="assets">
+					<view @click="goVirtualList">
+						<view class="assets_row">{{ t('global.coin') }}</view>
+						<view>{{userInfo.peanutCoin ?? 1}}</view>
+					</view>
+					<view @click="goPointsList">
+						<view class="assets_row">积分</view>
+						<view>{{userInfo.jf ?? 1}}</view>
+					</view>
+					<!-- <view>
+						<view class="assets_row">优惠卷</view>
+						<view>0</view>
+					</view> -->
+				</view>
+				<view class="chong_btn" @click="goRecharge">充 值</view>
+				<!-- <text class="wallet_title">{{$t('my.coin')}}<uni-icons type="help" size="19" color="#666"></uni-icons></text>
+				<text class="wallet_count">{{userMes.peanutCoin}}</text> -->
+			</view>
+		</view>
+
+		<!-- 功能菜单列表 -->
+		<view class="menu-section">
+			<wd-cell-group border class="menu-list">
+				<wd-cell v-for="item in menuItems" :key="item.id" :title="item.name" :label="item.desc" is-link
+					@click="handleMenuClick(item)">
+					<text v-if="item.hufenState" class="menu-list-hufen">{{hufenData?.total ?? 0}}<text
+							style="margin-left: 6rpx;">湖分</text></text>
+				</wd-cell>
+			</wd-cell-group>
+		</view>
+	</view>
 	<visitor v-else></visitor>
 </template>
 
@@ -97,7 +89,7 @@
 	import { getNotchHeight } from '@/utils/system'
 	import { parseTime } from '@/utils/index'
 	import { t } from '@/utils/i18n'
-	import { onShow } from '@dcloudio/uni-app'
+	import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
 	import visitor from '@/pages/visitor/index.vue';
 
 	const userStore = useUserStore()
@@ -174,9 +166,6 @@
 	// 湖分
 	const hufenData = ref()
 	const tokenState = ref(false)
-	
-	// 下拉刷新状态
-	const isRefreshing = ref(false)
 
 	/**
 	 * 获取平台信息
@@ -197,28 +186,6 @@
 		}
 	}
 
-	/**
-	 * 处理下拉刷新
-	 */
-	const handleRefresh = async () => {
-		isRefreshing.value = true
-		
-		try {
-			// 刷新所有数据
-			await Promise.all([
-				getData(),
-				getHufen()
-			])
-		} catch (error) {
-			console.error('刷新数据失败:', error)
-		} finally {
-			// 延迟关闭刷新状态，避免闪烁
-			setTimeout(() => {
-				isRefreshing.value = false
-			}, 500)
-		}
-	}
-
 	/**
 	 * 获取用户湖分
 	 */
@@ -306,21 +273,35 @@
 			url: '/pages/user/points/index'
 		})
 	}
- 
-	onShow(() => {
+
+	/**
+	 * 刷新数据
+	 */
+	const handleRefresh = async () => {
 		if (uni.getStorageSync('token')) {
 			tokenState.value = true
-			getData()
-			getHufen()
+			await Promise.all([
+				getPlatform(),
+				getData(),
+				getHufen()
+			])
 		}
-
+	}
+ 
+	onShow(() => {
+		handleRefresh()
 	})
 
 	onMounted(() => {
-		if (uni.getStorageSync('token')) {
-			getPlatform()
-			getHufen()
-		} 
+		handleRefresh()
+	})
+
+	onPullDownRefresh(async () => {
+		handleRefresh().then(() => {
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 500)
+		})
 	})
 </script>
 
diff --git a/style/tailwind.css b/style/tailwind.css
index 238ab3c..8399be9 100644
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -215,9 +215,6 @@
   .mt-2\! {
     margin-top: calc(var(--spacing) * 2) !important;
   }
-  .mt-5\! {
-    margin-top: calc(var(--spacing) * 5) !important;
-  }
   .mt-\[20rpx\]\! {
     margin-top: 20rpx !important;
   }
@@ -294,9 +291,6 @@
   .p-0\! {
     padding: calc(var(--spacing) * 0) !important;
   }
-  .p-3 {
-    padding: calc(var(--spacing) * 3);
-  }
   .p-\[10rpx\] {
     padding: 10rpx;
   }