From 4b706bb8115fb8fcba2c67813209f8a4bfd484ea Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Mon, 1 Dec 2025 16:35:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/news.ts    |  27 +++++++++
 pages.json             |   6 ++
 pages/news/details.vue | 122 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 155 insertions(+)
 create mode 100644 api/modules/news.ts
 create mode 100644 pages/news/details.vue

diff --git a/api/modules/news.ts b/api/modules/news.ts
new file mode 100644
index 0000000..12368fc
--- /dev/null
+++ b/api/modules/news.ts
@@ -0,0 +1,27 @@
+import { mainClient } from '@/api/clients/main'
+import type { IApiResponse } from '@/api/types'
+
+export const newsApi = {
+  /**
+   * 获取新闻详情
+   */
+  getNewsDetail: async (newsId: string | number) => {
+    const res = await mainClient.request<IApiResponse<any>>({
+      url: `common/message/getMessageById?id=${newsId}`,
+      method: 'POST'
+    })
+    return res
+  },
+
+  /**
+   * 获取太湖之光文章详情
+   */
+  getTaihuWelfareArticleDetail: async (newsId: string | number) => {
+    const res = await mainClient.request<IApiResponse<any>>({
+      url: 'common/taihuWelfare/getTaihuWelfareArticleDetail',
+      method: 'POST',
+      data: { id: newsId }
+    })
+    return res
+  }
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 0a8d423..fa4f305 100644
--- a/pages.json
+++ b/pages.json
@@ -193,6 +193,12 @@
 				"navigationStyle": "custom",
 				"navigationBarTitleText": "%order.orderDetails%"
 			}
+		}, {
+			"path": "pages/news/details",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "新闻详情"
+			}
 		}, {
 			"path": "uni_modules/uni-upgrade-center-app/pages/upgrade-popup",
 			"style": {
diff --git a/pages/news/details.vue b/pages/news/details.vue
new file mode 100644
index 0000000..0c57939
--- /dev/null
+++ b/pages/news/details.vue
@@ -0,0 +1,122 @@
+<template>
+  <view>
+    <!-- 自定义导航栏 -->
+    <nav-bar :title="$t('news.newsDetail')" />
+
+    <web-view v-if="urlVisible" :webview-styles="{ progress: { color: '#55aaff' } }" :src="surl"></web-view>
+    <view v-else class="box">
+			<view class="title">{{ news.title }}</view>
+			<view 
+				class="content" 
+				v-html="formattedContent"
+			></view>
+		</view>
+  </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { newsApi } from '@/api/modules/news'
+
+const newsId = ref<string | number | null>(null)
+const type = ref<number | null>(null)
+const urlVisible = ref(false)
+const surl = ref('')
+const source = ref('')
+
+onLoad((e: any) => {
+	newsId.value = e.newsId
+	type.value = Number(e.type)
+	surl.value = e.url || ''
+	source.value = e.source || ''
+  if(type.value == 1 && surl.value != ''){
+		urlVisible.value = true
+  } else {
+		getData()
+  }
+
+	// APP 设置导航栏按钮
+	// #ifdef APP-PLUS
+	// const pages = getCurrentPages()
+	// const page = pages[pages.length - 1]
+	// const currentWebview = page.$getAppWebview()
+
+	// currentWebview.setStyle({
+	// 	titleNView: {
+	// 		buttons: [{
+	// 			float: 'right',
+	// 			type: 'close',
+	// 			onclick: () => {
+	// 				uni.navigateBack({ delta: 1 })
+	// 			}
+	// 		}]
+	// 	}
+	// })
+	// #endif
+})
+
+// 新闻详情
+const news = ref({
+  title: '',
+  content: ''
+})
+// 获取新闻详情
+const getData = async () => {
+  let res = null
+	if (source.value === 'taihuzhiguang') {
+		res = await newsApi.getTaihuWelfareArticleDetail(newsId.value)
+	} else {
+    res = await newsApi.getNewsDetail(newsId.value)
+	}
+  news.value.title = res.result?.title || ''
+  news.value.content = res.result?.content || ''
+}
+
+// 格式化富文本内容
+const formatRichText = (html: string) => {
+	if (!html) return ""
+
+	let newContent = html.replace(/<img[^>]*>/gi, (match) => {
+		match = match.replace(/style="[^"]+"/gi, '')
+		match = match.replace(/width="[^"]+"/gi, '')
+		match = match.replace(/height="[^"]+"/gi, '')
+		return match
+	})
+
+	newContent = newContent.replace(/style="[^"]+"/gi, (match) => {
+		match = match.replace(/width:[^;]+;/gi, 'max-width:100%;')
+		return match
+	})
+
+	newContent = newContent.replace(/<br[^>]*\/>/gi, '')
+	newContent = newContent.replace(
+		/\<img/gi,
+		'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"'
+	)
+
+	return newContent
+}
+// 格式化后内容
+const formattedContent = computed(() => formatRichText(news.value.content))
+</script>
+
+<style lang="scss" scoped>
+.box {
+	background-color: #fff;		
+	padding: 10px;
+	min-height: calc(100vh - 270rpx);
+}
+
+.title {
+	font-size: 32rpx;
+	font-weight: bold; 
+	text-align: center;
+}
+
+.content { 
+	font-size: 26rpx; 
+	line-height: 48rpx; 
+	margin-top: 10rpx;
+}
+</style>
\ No newline at end of file

From 1049030a46d160d54a0af67567b7b24bbd191eb4 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Mon, 1 Dec 2025 16:39:58 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=86=85?=
 =?UTF-8?q?=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=8D?=
 =?UTF-8?q?=E8=B4=B9=E8=AF=BE=E7=A8=8B=E5=8F=8A=E8=AF=BE=E7=A8=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E3=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86=E6=94=AF=E4=BB=98=E9=BB=98=E8=AE=A4=E5=80=BC=E3=80=81?=
 =?UTF-8?q?=E4=B9=A6=E7=B1=8D=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/modules/course.ts                         |   2 +-
 components/course/CatalogueList.vue           |  96 ----
 components/course/ChapterList.vue             | 320 -------------
 components/order/Confirm.vue                  |  10 +-
 locale/en.json                                |   3 +
 locale/zh-Hans.json                           |   3 +
 pages/book/search.vue                         |  26 +-
 pages/course/details/chapter.vue              |   2 +-
 .../details/components/CatalogueList.vue      | 450 ++++++++++++++++++
 .../course/details/components}/CourseInfo.vue |   0
 pages/course/details/course.vue               | 155 ++----
 pages/course/index.vue                        |  18 +-
 static/nobg.jpg                               | Bin 0 -> 4985 bytes
 stores/course.ts                              | 142 ------
 style/tailwind.css                            |  92 +---
 15 files changed, 520 insertions(+), 799 deletions(-)
 delete mode 100644 components/course/CatalogueList.vue
 delete mode 100644 components/course/ChapterList.vue
 create mode 100644 pages/course/details/components/CatalogueList.vue
 rename {components/course => pages/course/details/components}/CourseInfo.vue (100%)
 create mode 100644 static/nobg.jpg
 delete mode 100644 stores/course.ts

diff --git a/api/modules/course.ts b/api/modules/course.ts
index c7b3cfd..eb411f1 100644
--- a/api/modules/course.ts
+++ b/api/modules/course.ts
@@ -114,7 +114,7 @@ export const courseApi = {
   },
 
   /**
-   * 开始学习免费课程
+   * 领取免费课程
    * @param catalogueId 目录ID
    */
   startStudyForMF(catalogueId: number) {
diff --git a/components/course/CatalogueList.vue b/components/course/CatalogueList.vue
deleted file mode 100644
index da9ddef..0000000
--- a/components/course/CatalogueList.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-  <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', currentIndex === index ? 'active' : '']"
-      @click="handleSelect(index)"
-    >
-      <text class="catalogue-title">{{ catalogue.title }}</text>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import type { ICatalogue, IVipInfo } from '@/types/course'
-
-interface Props {
-  catalogues: ICatalogue[]
-  currentIndex: number
-  userVip: IVipInfo | null
-}
-
-const props = defineProps<Props>()
-
-const emit = defineEmits<{
-  change: [index: number]
-}>()
-
-/**
- * 选择目录
- */
-const handleSelect = (index: number) => {
-  if (index === props.currentIndex) return
-  emit('change', index)
-}
-</script>
-
-<style lang="scss" scoped>
-.catalogue-list {
-  display: flex;
-  align-items: flex-end;
-  padding: 20rpx;
-  padding-bottom: 0;
-  border-radius: 20rpx 20rpx 0 0;
-  margin-top: 20rpx;
-  
-  &.vip-style {
-    background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
-    
-    .catalogue-item {
-      background-color: rgba(0, 0, 0, 0.4);
-      color: #fff;
-      border-color: #fff;
-      
-      &.active {
-        background-color: #258feb;
-        color: #fff;
-      }
-    }
-  }
-  
-  .catalogue-item {
-    flex: 1;
-    text-align: center;
-    padding: 16rpx 0;
-    margin-right: 10rpx;
-    border-radius: 20rpx 20rpx 0 0;
-    border: 1px solid #fff;
-    border-bottom: none;
-    background-color: rgba(0, 0, 0, 0.4);
-    color: #fff;
-    transition: all 0.3s;
-    
-    &:last-child {
-      margin-right: 0;
-    }
-    
-    &.active {
-      background-color: #258feb;
-      padding: 20rpx 0;
-      
-      .catalogue-title {
-        font-size: 36rpx;
-        font-weight: bold;
-      }
-    }
-    
-    .catalogue-title {
-      font-size: 30rpx;
-    }
-  }
-}
-</style>
diff --git a/components/course/ChapterList.vue b/components/course/ChapterList.vue
deleted file mode 100644
index d6eeaf9..0000000
--- a/components/course/ChapterList.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
-  <view class="chapter-list">
-    <!-- 目录状态信息 -->
-    <view v-if="catalogue" class="catalogue-status">
-      <view v-if="catalogue.isBuy === 1 || userVip" class="purchased-info">
-        <view class="info-row">
-          <text v-if="userVip">
-            VIP畅学权益有效期截止到：{{ userVip.endTime }}
-          </text>
-          <template v-else>
-            <text v-if="!catalogue.startTime">
-              当前目录还未开始学习
-            </text>
-            <text v-else>
-              课程有效期截止到：{{ catalogue.endTime }}
-            </text>
-            <!-- <wd-button 
-              v-if="catalogue.startTime"
-              size="small"
-              @click="handleRenew"
-            >
-              续费
-            </wd-button> -->
-          </template>
-        </view>
-      </view>
-      
-      <!-- 未购买状态 -->
-      <view v-else-if="catalogue.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="showRenewBtn"
-            size="small"
-            type="success"
-            @click="handleRenew"
-          >
-            {{ $t('courseDetails.relearn') }}
-          </wd-button>
-          <wd-button size="small" type="primary" @click="goToVip">
-            {{ $t('courseDetails.openVip') }}
-          </wd-button>
-        </view>
-      </view>
-    </view>
-
-    <view v-if="chapters.length > 0" class="chapter-content">
-      <!-- VIP标识 -->
-      <view v-if="userVip" class="vip-badge">
-        <text>VIP畅学权益生效中</text>
-      </view>
-      
-      <!-- 章节列表 -->
-      <view
-        v-for="(chapter, index) in chapters"
-        :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-if="!canAccess(chapter)" class="lock-icon">
-            <wd-icon name="lock-on" size="24px" color="#258feb" />
-          </view>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 暂无章节 -->
-    <view v-else class="no-chapters">
-      <text>暂无章节内容</text>
-    </view>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import type { IChapter, ICatalogue, IVipInfo } from '@/types/course'
-
-interface Props {
-  chapters: IChapter[]
-  catalogue: ICatalogue
-  userVip: IVipInfo | null
-  showRenewBtn?: boolean
-}
-
-const props = defineProps<Props>()
-
-const emit = defineEmits<{
-  click: [chapter: IChapter],
-  purchase: [catalogue: ICatalogue],
-  renew: [catalogue: ICatalogue],
-  toVip: [catalogue: ICatalogue],
-}>()
-
-/**
- * 判断目录是否已购买
- */
-const isPurchased = computed(() => {
-  return props.catalogue.isBuy === 1
-})
-// 购买
-const handlePurchase = () => {
-  emit('purchase', props.catalogue)
-}
-// 去开通vip
-const goToVip = () => {
-  emit('toVip', props.catalogue)
-}
-
-// 续费/复读
-const handleRenew = () => {
-  emit('renew', props.catalogue)
-}
-
-// 领取免费课程
-const handleGetFreeCourse = () => {
-  emit('purchase', props.catalogue)
-}
-
-/**
- * 判断章节是否可以访问
- */
-const canAccess = (chapter: IChapter): boolean => {
-  // VIP用户可以访问所有章节
-  if (props.userVip) return true
-  
-  // 已购买目录可以访问所有章节
-  if (isPurchased.value) return true
-  
-  // 试听章节可以访问
-  if (chapter.isAudition === 1) return true
-  
-  // 免费课程可以访问
-  if (props.catalogue.type === 0) return true
-  
-  return false
-}
-
-/**
- * 点击章节
- */
-const handleChapterClick = (chapter: IChapter) => {
-  if (!canAccess(chapter)) {
-    if (props.catalogue.type === 0) {
-      uni.showToast({
-        title: '请先领取课程',
-        icon: 'none'
-      })
-    } else {
-      uni.showToast({
-        title: '请先购买课程',
-        icon: 'none'
-      })
-    }
-    return
-  }
-  
-  emit('click', chapter)
-}
-</script>
-
-<style lang="scss" scoped>
-.chapter-list {
-  padding: 20rpx;
-}
-
-.catalogue-status {
-  padding: 20rpx;
-  margin-bottom: 20rpx;
-  background-color: #fff;
-  
-  .purchased-info {
-    .info-row {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      font-size: 26rpx;
-      line-height: 50rpx;
-    }
-  }
-  
-  .free-course {
-    text-align: center;
-  }
-  
-  .unpurchased-info {
-    .tip-text {
-      display: block;
-      font-size: 26rpx;
-      color: #666;
-      margin-bottom: 20rpx;
-      line-height: 1.6;
-    }
-    
-    .action-btns {
-      display: flex;
-      gap: 20rpx;
-      justify-content: center;
-    }
-  }
-}
-
-.chapter-content {
-  position: relative;
-  padding: 20rpx;
-  border: 4rpx solid #fffffc;
-  background: linear-gradient(52deg, #e8f6ff 0%, #e3f2fe 50%);
-  box-shadow: 0px 0px 10px 0px #89c8e9;
-  border-top-right-radius: 40rpx;
-  border-bottom-left-radius: 40rpx;
-  
-  .vip-badge {
-    display: inline-block;
-    font-size: 24rpx;
-    background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
-    color: #fff;
-    padding: 10rpx 20rpx;
-    border-radius: 0 50rpx 50rpx 0;
-    z-index: 1;
-  }
-  
-  .chapter-item {
-    padding: 20rpx 0;
-    border-bottom: 1px solid #fff;
-    
-    &:last-child {
-      border-bottom: none;
-    }
-    
-    .chapter-content-wrapper {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      
-      .chapter-info {
-        flex: 1;
-        display: flex;
-        align-items: center;
-        gap: 10rpx;
-        
-        &.locked {
-          opacity: 0.6;
-        }
-        
-        .chapter-title {
-          flex: 1;
-          font-size: 28rpx;
-          color: #1e2f3e;
-          line-height: 1.5;
-        }
-        
-        .chapter-tag {
-          flex-shrink: 0;
-        }
-      }
-      
-      .lock-icon {
-        margin-left: 20rpx;
-        flex-shrink: 0;
-      }
-    }
-  }
-}
-
-.no-chapters {
-  text-align: center;
-  padding: 80rpx 0;
-  color: #999;
-  font-size: 28rpx;
-}
-</style>
diff --git a/components/order/Confirm.vue b/components/order/Confirm.vue
index 344b448..285b648 100644
--- a/components/order/Confirm.vue
+++ b/components/order/Confirm.vue
@@ -290,7 +290,11 @@ const handlePointsInput = (value: any) => {
   }
   
   // 重新计算实付款
-  calculateFinalPrice()
+  const result = Math.max(
+    0,
+    totalAmount.value - pointsDiscounted.value - promotionDiscounted.value - vipDiscounted.value
+  )
+  finalAmount.value = result
 }
 
 /**
@@ -314,9 +318,11 @@ const calculateFinalPrice = () => {
     props?.userInfo?.jf || 0,
     Math.floor(orderAmountAfterDiscount - couponAmount)
   )
+
+  pointsDiscounted.value = pointsUsableMax.value
   
   // 限制当前积分不超过最大值
-  if (pointsDiscounted.value > pointsUsableMax.value) {
+  if (pointsDiscounted.value >= pointsUsableMax.value) {
     pointsDiscounted.value = pointsUsableMax.value
   }
   
diff --git a/locale/en.json b/locale/en.json
index 0d4b3b0..e8378da 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -491,5 +491,8 @@
     "openVip": "Open Now",
     "renewal": "Renewal",
     "daily": "Daily"
+  },
+  "news": {
+    "newsDetail": "News Detail"
   }
 }
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 496bc55..831db6a 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -491,5 +491,8 @@
     "openVip": "立即开通",
     "renewal": "续费",
     "daily": "日均"
+  },
+  "news": {
+    "newsDetail": "新闻详情"
   }
 }
diff --git a/pages/book/search.vue b/pages/book/search.vue
index 1bf1b0e..497f7dd 100644
--- a/pages/book/search.vue
+++ b/pages/book/search.vue
@@ -27,12 +27,7 @@
         >
           <image :src="item.images" />
           <text class="book-text">{{ item.name }}</text>
-          <text v-if="formatPrice(item)" class="book-price">{{
-            formatPrice(item)
-          }}</text>
-          <text v-if="formatStats(item)" class="book-flag">{{
-            formatStats(item)
-          }}</text>
+          <BookPrice :data="item" class="book-price-container" />
         </view>
       </view>
       <view v-else-if="isEmpty" class="empty-wrapper">
@@ -47,6 +42,7 @@ import { ref, onMounted } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import { homeApi } from '@/api/modules/book_home'
+import BookPrice from '@/components/book/BookPrice.vue'
 import type { IBookWithStats, IVipInfo } from '@/types/home'
 
 const { t } = useI18n()
@@ -260,21 +256,9 @@ onMounted(async () => {
       overflow: hidden;
     }
 
-    .book-price {
-      position: absolute;
-      font-size: 28rpx;
-      color: #ff4703;
-      left: 30rpx;
-      bottom: 20rpx;
-    }
-
-    .book-flag {
-      display: block;
-      font-size: 26rpx;
-      color: #999;
-      position: absolute;
-      right: 6%;
-      bottom: 20rpx;
+    .book-price-container {
+      width: 80%;
+      margin: 15rpx auto 0;
     }
   }
 }
diff --git a/pages/course/details/chapter.vue b/pages/course/details/chapter.vue
index 014bdfa..537d86b 100644
--- a/pages/course/details/chapter.vue
+++ b/pages/course/details/chapter.vue
@@ -31,7 +31,7 @@
       <view v-if="videoList.length > 0" class="video-list-section">
         <view class="section-title">{{ $t('courseDetails.videoTeaching') }}</view>
         <wd-radio-group v-model="currentVideoIndex" shape="button" >
-          <wd-radio v-for="(video, index) in videoList" :key="video.id" :value="index">
+          <wd-radio v-for="(video, index) in videoList" :key="video.id" :value="index" class="mb-2!">
             【{{ video.type == "2" ? $t('courseDetails.audio') : $t('courseDetails.video') }}】{{ index + 1 }}
           </wd-radio>
         </wd-radio-group>
diff --git a/pages/course/details/components/CatalogueList.vue b/pages/course/details/components/CatalogueList.vue
new file mode 100644
index 0000000..de9e50d
--- /dev/null
+++ b/pages/course/details/components/CatalogueList.vue
@@ -0,0 +1,450 @@
+<template>
+  <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="showRenewBtn"
+              size="small"
+              type="success"
+              @click="handleRenew"
+            >
+              {{ $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-if="!canAccess(chapter)" class="lock-icon">
+              <wd-icon name="lock-on" size="24px" color="#258feb" />
+            </view>
+          </view>
+        </view>
+      </view>
+      
+      <!-- 暂无章节 -->
+      <view v-else class="no-chapters">
+        <text>暂无章节内容</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue'
+import { courseApi } from '@/api/modules/course'
+import type { IChapter, ICatalogue, IVipInfo } from '@/types/course'
+
+interface Props {
+  catalogues: ICatalogue[]
+  userVip: IVipInfo | null
+  showRenewBtn?: boolean
+}
+
+const props = defineProps<Props>()
+
+const emit = defineEmits<{
+  click: [chapter: IChapter],
+  purchase: [catalogue: ICatalogue],
+  renew: [catalogue: ICatalogue],
+  toVip: [catalogue: ICatalogue],
+  change: [index: number]
+}>()
+
+// 当前目录索引
+const currentCatalogueIndex = ref<number>(0)
+// 当前目录
+const currentCatalogue = computed(() => {
+  return props.catalogues[currentCatalogueIndex.value]
+})
+// 当前目录的章节
+const chapterList = ref<IChapter[]>([])
+
+// 显示续费按钮
+const showRenewBtn = ref<boolean>(false)
+
+// 判断目录是否已购买
+const isPurchased = computed(() => {
+  return currentCatalogue.value.isBuy === 1
+})
+
+/**
+ * 选择目录
+ */
+const handleSelect = (index: number) => {
+  if (index === currentCatalogueIndex.value) return
+
+  currentCatalogueIndex.value = index
+
+  getChapters() // 获取章节列表
+  checkRenewPayment() // 检查是否支持复读
+}
+
+/**
+ * 获取当前目录的章节
+ */
+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) {
+    const renewRes = await courseApi.checkRenewPayment(currentCatalogue.value.id)
+    showRenewBtn.value = renewRes.canRelearn || false
+  } else {
+    showRenewBtn.value = false
+  }
+}
+
+/**
+ * 监听目录变化
+ */
+watch(() => props.catalogues, (newVal: ICatalogue[]) => {
+  if (newVal.length > 0) {
+    currentCatalogueIndex.value = 0
+    getChapters()
+    checkRenewPayment()
+  }
+}, { immediate: true, deep: true })
+
+// 购买
+const handlePurchase = () => {
+  emit('purchase', currentCatalogue.value)
+}
+
+// 去开通vip
+const goToVip = () => {
+  emit('toVip', currentCatalogue.value)
+}
+
+// 续费/复读
+const handleRenew = () => {
+  emit('renew', currentCatalogue.value)
+}
+
+// 领取免费课程
+const handleGetFreeCourse = async () => {
+  emit('getFreeCourse', currentCatalogue.value)
+}
+
+/**
+ * 判断章节是否可以访问
+ */
+const canAccess = (chapter: IChapter): boolean => {
+  // VIP用户可以访问所有章节
+  if (props.userVip) return true
+  
+  // 已购买目录可以访问所有章节
+  if (isPurchased.value) return true
+  
+  // 试听章节可以访问
+  if (chapter.isAudition === 1) return true
+  
+  // 免费课程可以访问
+  if (currentCatalogue.value.type === 0) return true
+  
+  return false
+}
+
+/**
+ * 点击章节
+ */
+const handleChapterClick = (chapter: IChapter, catalogue: ICatalogue) => {
+  if (!isPurchased.value && currentCatalogue.value.type === 0) {
+    uni.showToast({
+      title: '请先领取课程',
+      icon: 'none'
+    })
+    return
+  }
+  if (!canAccess(chapter)) {
+    uni.showToast({
+      title: '请先购买课程',
+      icon: 'none'
+    })
+    return
+  }
+  
+  emit('toDetail', chapter, currentCatalogue.value)
+}
+</script>
+
+<style lang="scss" scoped>
+.course-content-wrapper {
+  background: linear-gradient(108deg, #c3e7ff 0%, #59bafe 100%);
+}
+.catalogue-list {
+  display: flex;
+  align-items: flex-end;
+  padding: 20rpx;
+  padding-bottom: 0;
+  border-radius: 20rpx 20rpx 0 0;
+  margin-top: 20rpx;
+  
+  &.vip-style {
+    background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
+    
+    .catalogue-item {
+      background-color: rgba(0, 0, 0, 0.4);
+      color: #fff;
+      border-color: #fff;
+      
+      &.active {
+        background-color: #258feb;
+        color: #fff;
+      }
+    }
+  }
+  
+  .catalogue-item {
+    flex: 1;
+    text-align: center;
+    padding: 16rpx 0;
+    margin-right: 10rpx;
+    border-radius: 20rpx 20rpx 0 0;
+    border: 1px solid #fff;
+    border-bottom: none;
+    background-color: rgba(0, 0, 0, 0.4);
+    color: #fff;
+    transition: all 0.3s;
+    
+    &:last-child {
+      margin-right: 0;
+    }
+    
+    &.active {
+      background-color: #258feb;
+      padding: 20rpx 0;
+      
+      .catalogue-title {
+        font-size: 36rpx;
+        font-weight: bold;
+      }
+    }
+    
+    .catalogue-title {
+      font-size: 30rpx;
+    }
+  }
+}
+
+.chapter-list {
+  padding: 20rpx;
+}
+
+.catalogue-status {
+  padding: 20rpx;
+  margin-bottom: 20rpx;
+  background-color: #fff;
+  
+  .purchased-info {
+    .info-row {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 26rpx;
+      line-height: 50rpx;
+    }
+  }
+  
+  .free-course {
+    text-align: center;
+  }
+  
+  .unpurchased-info {
+    .tip-text {
+      display: block;
+      font-size: 26rpx;
+      color: #666;
+      margin-bottom: 20rpx;
+      line-height: 1.6;
+    }
+    
+    .action-btns {
+      display: flex;
+      gap: 20rpx;
+      justify-content: center;
+    }
+  }
+}
+
+.chapter-content {
+  position: relative;
+  padding: 20rpx;
+  border: 4rpx solid #fffffc;
+  background: linear-gradient(52deg, #e8f6ff 0%, #e3f2fe 50%);
+  box-shadow: 0px 0px 10px 0px #89c8e9;
+  border-top-right-radius: 40rpx;
+  border-bottom-left-radius: 40rpx;
+  
+  .vip-badge {
+    display: inline-block;
+    font-size: 24rpx;
+    background: linear-gradient(90deg, #6429db 0%, #0075ed 100%);
+    color: #fff;
+    padding: 10rpx 20rpx;
+    border-radius: 0 50rpx 50rpx 0;
+    z-index: 1;
+  }
+  
+  .chapter-item {
+    padding: 20rpx 0;
+    border-bottom: 1px solid #fff;
+    
+    &:last-child {
+      border-bottom: none;
+    }
+    
+    .chapter-content-wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      
+      .chapter-info {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        gap: 10rpx;
+        
+        &.locked {
+          opacity: 0.6;
+        }
+        
+        .chapter-title {
+          flex: 1;
+          font-size: 28rpx;
+          color: #1e2f3e;
+          line-height: 1.5;
+        }
+        
+        .chapter-tag {
+          flex-shrink: 0;
+        }
+      }
+      
+      .lock-icon {
+        margin-left: 20rpx;
+        flex-shrink: 0;
+      }
+    }
+  }
+}
+
+.no-chapters {
+  text-align: center;
+  padding: 80rpx 0;
+  color: #999;
+  font-size: 28rpx;
+}
+</style>
diff --git a/components/course/CourseInfo.vue b/pages/course/details/components/CourseInfo.vue
similarity index 100%
rename from components/course/CourseInfo.vue
rename to pages/course/details/components/CourseInfo.vue
diff --git a/pages/course/details/course.vue b/pages/course/details/course.vue
index c10c816..067cd5d 100644
--- a/pages/course/details/course.vue
+++ b/pages/course/details/course.vue
@@ -16,40 +16,23 @@
     <CourseInfo v-if="courseDetail" :course="courseDetail" :class="{'pt-10': !!vipTip}" />
 
     <!-- 课程内容包装器 -->
-    <view class="course-content-wrapper">
-      <!-- 目录列表 -->
-      <CatalogueList
-        v-if="catalogueList.length > 0"
-        :catalogues="catalogueList"
-        :currentIndex="currentCatalogueIndex"
-        :userVip="userVip"
-        @change="handleCatalogueChange"
-      />
-
-      <!-- 章节列表 -->
-      <ChapterList
-        v-if="chapterList.length > 0"
-        :chapters="chapterList"
-        :catalogue="currentCatalogue"
-        :userVip="userVip"
-        :showRenewBtn="showRenewBtn"
-        @purchase="handlePurchase"
-        @toVip="goToVip"
-        @renew="handleRenew"
-        @click="handleChapterClick"
-      />
-    </view>
+    <CatalogueList
+      v-if="catalogueList.length > 0"
+      :catalogues="catalogueList"
+      :userVip="userVip"
+      @getFreeCourse="handleGetFreeCourse"
+      @purchase="handlePurchase"
+      @toVip="goToVip"
+      @renew="handleRenew"
+      @toDetail="handleToDetail"
+    />
 
     <!-- 学习进度 -->
     <view class="learning-progress">
       <view class="progress-title">
         <text>{{ $t('courseDetails.progress') }}</text>
       </view>
-      <wd-progress 
-        :percentage="learningProgress" 
-        show-text
-        stroke-width="6"
-      />
+      <wd-progress :percentage="learningProgress" show-text stroke-width="6" />
     </view>
 
     <!-- 相关书籍 -->
@@ -166,30 +149,24 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import { onLoad, onPageScroll, onPullDownRefresh, onReachBottom, onShow } from '@dcloudio/uni-app'
-import { useCourseStore } from '@/stores/course'
 import { useUserStore } from '@/stores/user'
 import { courseApi } from '@/api/modules/course'
-import CourseInfo from '@/components/course/CourseInfo.vue'
-import CatalogueList from '@/components/course/CatalogueList.vue'
-import ChapterList from '@/components/course/ChapterList.vue'
+import CourseInfo from './components/CourseInfo.vue'
+import CatalogueList from './components/CatalogueList.vue'
 import GoodsSelector from '@/components/order/GoodsSelector.vue'
 import CommentList from '@/components/comment/CommentList.vue'
 import CommentEditor from '@/components/comment/CommentEditor.vue'
-import NavBar from '@/components/nav-bar/nav-bar.vue'
 import type { ICourseDetail, ICatalogue, IChapter, IVipInfo } from '@/types/course'
 import type { IGoods } from '@/types/order'
 import type { IComment } from '@/types/comment'
 
 // Stores
-const courseStore = useCourseStore()
 const userStore = useUserStore()
 
 // 页面数据
 const courseId = ref<number>(0)
 const courseDetail = ref<ICourseDetail | null>(null)
 const catalogueList = ref<ICatalogue[]>([])
-const currentCatalogueIndex = ref(0)
-const chapterList = ref<IChapter[]>([])
 const userVip = ref<IVipInfo | null>(null)
 const vipModuleList = ref<string[]>([])
 const learningProgress = ref(0)
@@ -202,7 +179,6 @@ const selectedGoods = ref<IGoods | null>(null)
 const showProtocol = ref(false)
 const isFudu = ref(false)
 const fuduCatalogueId = ref<number>(0)
-const showRenewBtn = ref(false)
 
 // 评论相关
 const commentList = ref<IComment[]>([])
@@ -215,14 +191,6 @@ const replyComment = ref<IComment | undefined>(undefined)
 // UI状态
 const scrollTop = ref(0)
 
-/**
- * 当前目录
- */
-const currentCatalogue = computed(() => {
-  if (catalogueList.value.length === 0) return null
-  return catalogueList.value[currentCatalogueIndex.value] || null
-})
-
 /**
  * VIP提示文案
  */
@@ -286,11 +254,6 @@ const loadPageData = async () => {
       const totalProgress = catalogueList.value.reduce((sum, cat) => sum + cat.completion, 0)
       learningProgress.value = Number((totalProgress / catalogueList.value.length).toFixed(2))
     }
-    
-    // 默认选择第一个目录
-    if (catalogueList.value.length > 0) {
-      await switchCatalogue(0)
-    }
   }
   
   // 检查VIP权益
@@ -318,69 +281,50 @@ const checkVipStatus = async () => {
   }
 }
 
-/**
- * 切换目录
- */
-const switchCatalogue = async (index: number) => {
-  currentCatalogueIndex.value = index
-  const catalogue = catalogueList.value[index]
-  
-  // 获取章节列表
-  const res = await courseApi.getCatalogueChapterList(catalogue.id)
-  if (res.code === 0) {
-    chapterList.value = res.chapterList || []
-  }
-  
-  // 检查是否支持复读
-  if (catalogue.isBuy === 0 && !userVip.value) {
-    const renewRes = await courseApi.checkRenewPayment(catalogue.id)
-    showRenewBtn.value = renewRes.canRelearn || false
-  } else {
-    showRenewBtn.value = false
-  }
-}
-
-/**
- * 目录切换事件
- */
-const handleCatalogueChange = (index: number) => {
-  switchCatalogue(index)
-}
-
 /**
  * 点击章节
  */
-const handleChapterClick = (chapter: IChapter) => {
-  const noRecored = chapter.isAudition === 1 && currentCatalogue.value?.isBuy === 0 && !userVip.value
+const handleToDetail = (chapter: IChapter, catalogue: ICatalogue) => {
+  const noRecored = chapter.isAudition === 1 && catalogue.isBuy === 0 && !userVip.value
   
   uni.navigateTo({
     url: `/pages/course/details/chapter?id=${chapter.id}&courseId=${courseId.value}&courseTitle=${courseDetail.value?.title}&title=${chapter.title}&noRecored=${noRecored}`
   })
 }
 
+/**
+ * 去开通vip
+ */
+const goToVip = () => {
+  uni.navigateTo({
+    url: '/pages/vip/course'
+  })
+}
+
 /**
  * 领取免费课程
  */
-const handleGetFreeCourse = async () => {
-  if (!currentCatalogue.value) return
+const handleGetFreeCourse = async (catalogue: ICatalogue) => {
+  if (!catalogue) return
   
-  uni.showLoading({ title: '领取中...' })
-  const res = await courseApi.startStudyForMF(currentCatalogue.value.id)
+  const res = await courseApi.startStudyForMF(catalogue.id)
   if (res.code === 0) {
     uni.showToast({ title: '领取成功', icon: 'success' })
     // 刷新页面数据
-    await loadPageData()
+    loadPageData()
+  } else {
+    uni.showToast({ title: res.msg || '领取失败', icon: 'none' })
   }
 }
 
 /**
  * 购买课程
  */
-const handlePurchase = async () => {
-  if (!currentCatalogue.value) return
+const handlePurchase = async (catalogue: ICatalogue) => {
+  if (!catalogue) return
   
   isFudu.value = false
-  const res = await courseApi.getProductListForCourse(currentCatalogue.value.id)
+  const res = await courseApi.getProductListForCourse(catalogue.id)
   if (res.code === 0 && res.productList.length > 0) {
     goodsList.value = res.productList
     showGoodsSelector.value = true
@@ -393,17 +337,17 @@ const handlePurchase = async () => {
  * 续费/复读
  */
 const handleRenew = async () => {
-  if (!currentCatalogue.value) return
+  // if (!currentCatalogue.value) return
   
-  isFudu.value = true
-  fuduCatalogueId.value = currentCatalogue.value.id
-  const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
-  if (res.code === 0 && res.productList.length > 0) {
-    goodsList.value = res.productList
-    showGoodsSelector.value = true
-  } else {
-    uni.showToast({ title: '暂无复读方案', icon: 'none' })
-  }
+  // isFudu.value = true
+  // fuduCatalogueId.value = currentCatalogue.value.id
+  // const res = await courseApi.getRenewProductList(currentCatalogue.value.id)
+  // if (res.code === 0 && res.productList.length > 0) {
+  //   goodsList.value = res.productList
+  //   showGoodsSelector.value = true
+  // } else {
+  //   uni.showToast({ title: '暂无复读方案', icon: 'none' })
+  // }
 }
 
 /**
@@ -443,15 +387,6 @@ const confirmPurchase = () => {
   })
 }
 
-/**
- * 跳转到VIP页面
- */
-const goToVip = () => {
-  uni.navigateTo({
-    url: '/pages/vip/course'
-  })
-}
-
 /**
  * 跳转到书籍详情
  */
@@ -698,10 +633,6 @@ onReachBottom(() => {
   }
 }
 
-.course-content-wrapper {
-  background: linear-gradient(108deg, #c3e7ff 0%, #59bafe 100%);
-}
-
 .learning-progress {
   padding: 20rpx;
   background-color: #fff;
diff --git a/pages/course/index.vue b/pages/course/index.vue
index 124ff46..5d58734 100644
--- a/pages/course/index.vue
+++ b/pages/course/index.vue
@@ -326,10 +326,6 @@ const getSociologyCateList = async () => {
  * 终极分类点击处理
  */
 const curseClickJump = (item: IMedicalTag) => {
-  // uni.showToast({
-  //   title: '课程分类列表正在开发中，现在还不能跳转',
-  //   icon: 'none'
-  // })
   uni.navigateTo({
     url: `/pages/course/list/category?id=${item.id}&title=${item.title}&pid=${item.pid}&subject=${selectedFirstLevel.value}`
   })
@@ -385,15 +381,9 @@ const getNewsList = async () => {
  * 新闻点击处理
  */
 const newsClick = (item: INews) => {
-  if (item.type === 1 && item.url) {
-    uni.navigateTo({
-      url: `/pages/news/newsForwebview?newsId=${item.id}&url=${item.url}&type=${item.type}`
-    })
-  } else {
-    uni.navigateTo({
-      url: `/pages/news/news?newsId=${item.id}&url=${item.url}&type=${item.type}`
-    })
-  }
+  uni.navigateTo({
+    url: `/pages/news/details?newsId=${item.id}&url=${item.url}&type=${item.type}`
+  })
 }
 
 // 精彩试听
@@ -846,7 +836,7 @@ $border-color: #eeeeee;
 // 观看记录和试听样式
 .learnBox {
   background-color: #fff;
-  margin: 10px 5px 20px;
+  margin: 10px 5px;
   border-radius: 20rpx;
   padding: 10px;
   box-shadow: 0px 0px 10px 0px rgba(167, 187, 228, 0.3);
diff --git a/static/nobg.jpg b/static/nobg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e2580cd4d637e21107ca290166af7eb4530d8f14
GIT binary patch
literal 4985
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
U16$}v)UTuJU6%is3TWH^4Y;?;mjD0&

literal 0
HcmV?d00001

diff --git a/stores/course.ts b/stores/course.ts
deleted file mode 100644
index b38dc26..0000000
--- a/stores/course.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-// stores/course.ts
-import { defineStore } from 'pinia'
-import { courseApi } from '@/api/modules/course'
-import type { ICourseDetail, ICatalogue, IChapter, IVipInfo } from '@/types/course'
-
-interface CourseState {
-  currentCourse: ICourseDetail | null
-  catalogueList: ICatalogue[]
-  currentCatalogueIndex: number
-  chapterList: IChapter[]
-  userVip: IVipInfo | null
-  learningProgress: number
-}
-
-export const useCourseStore = defineStore('course', {
-  state: (): CourseState => ({
-    currentCourse: null,
-    catalogueList: [],
-    currentCatalogueIndex: 0,
-    chapterList: [],
-    userVip: null,
-    learningProgress: 0,
-  }),
-
-  getters: {
-    /**
-     * 获取当前选中的目录
-     */
-    currentCatalogue: (state): ICatalogue | null => {
-      if (state.catalogueList.length === 0) return null
-      return state.catalogueList[state.currentCatalogueIndex] || null
-    },
-
-    /**
-     * 判断当前目录是否已购买
-     */
-    isCurrentCataloguePurchased: (state): boolean => {
-      const catalogue = state.catalogueList[state.currentCatalogueIndex]
-      return catalogue ? catalogue.isBuy === 1 : false
-    },
-
-    /**
-     * 判断用户是否为VIP
-     */
-    isVip: (state): boolean => {
-      return state.userVip !== null
-    },
-  },
-
-  actions: {
-    /**
-     * 获取课程详情
-     * @param courseId 课程ID
-     */
-    async fetchCourseDetail(courseId: number) {
-      try {
-        const res = await courseApi.getCourseDetail(courseId)
-        if (res.code === 0 && res.data) {
-          this.currentCourse = res.data.course
-          this.catalogueList = res.data.catalogues || []
-          
-          // 计算学习进度
-          if (this.catalogueList.length > 0) {
-            const totalProgress = this.catalogueList.reduce((sum, cat) => sum + cat.completion, 0)
-            this.learningProgress = Number((totalProgress / this.catalogueList.length).toFixed(2))
-          } else {
-            this.learningProgress = 0
-          }
-        }
-        return res
-      } catch (error) {
-        console.error('获取课程详情失败:', error)
-        throw error
-      }
-    },
-
-    /**
-     * 切换目录
-     * @param index 目录索引
-     */
-    async switchCatalogue(index: number) {
-      if (index < 0 || index >= this.catalogueList.length) {
-        console.warn('目录索引超出范围')
-        return
-      }
-      
-      this.currentCatalogueIndex = index
-      const catalogue = this.catalogueList[index]
-      
-      // 获取该目录的章节列表
-      await this.fetchChapterList(catalogue.id)
-    },
-
-    /**
-     * 获取章节列表
-     * @param catalogueId 目录ID
-     */
-    async fetchChapterList(catalogueId: number) {
-      try {
-        const res = await courseApi.getCatalogueChapterList(catalogueId)
-        if (res.code === 0) {
-          this.chapterList = res.chapterList || []
-        }
-        return res
-      } catch (error) {
-        console.error('获取章节列表失败:', error)
-        this.chapterList = []
-        throw error
-      }
-    },
-
-    /**
-     * 检查用户VIP权益
-     * @param courseId 课程ID
-     */
-    async checkVipStatus(courseId: number) {
-      try {
-        const res = await courseApi.checkCourseVip(courseId)
-        if (res.code === 0) {
-          this.userVip = res.userVip || null
-        }
-        return res
-      } catch (error) {
-        console.error('检查VIP权益失败:', error)
-        this.userVip = null
-        throw error
-      }
-    },
-
-    /**
-     * 重置课程状态
-     */
-    resetCourseState() {
-      this.currentCourse = null
-      this.catalogueList = []
-      this.currentCatalogueIndex = 0
-      this.chapterList = []
-      this.userVip = null
-      this.learningProgress = 0
-    },
-  },
-})
diff --git a/style/tailwind.css b/style/tailwind.css
index f87c03a..4566267 100644
--- a/style/tailwind.css
+++ b/style/tailwind.css
@@ -8,7 +8,6 @@
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
       "Courier New", monospace;
     --color-red-500: oklch(63.7% 0.237 25.331);
-    --color-white: #fff;
     --spacing: 0.25rem;
     --text-xs: 0.75rem;
     --text-xs--line-height: calc(1 / 0.75);
@@ -212,18 +211,12 @@
       max-width: 96rem;
     }
   }
-  .mr-1 {
-    margin-right: calc(var(--spacing) * 1);
-  }
-  .ml-1 {
-    margin-left: calc(var(--spacing) * 1);
+  .mb-2\! {
+    margin-bottom: calc(var(--spacing) * 2) !important;
   }
   .ml-1\! {
     margin-left: calc(var(--spacing) * 1) !important;
   }
-  .ml-2 {
-    margin-left: calc(var(--spacing) * 2);
-  }
   .ml-2\.5\! {
     margin-left: calc(var(--spacing) * 2.5) !important;
   }
@@ -251,24 +244,6 @@
   .table {
     display: table;
   }
-  .h-20 {
-    height: calc(var(--spacing) * 20);
-  }
-  .h-\[80px\] {
-    height: 80px;
-  }
-  .h-\[80rpx\] {
-    height: 80rpx;
-  }
-  .w-20 {
-    width: calc(var(--spacing) * 20);
-  }
-  .w-\[80px\] {
-    width: 80px;
-  }
-  .w-\[80rpx\] {
-    width: 80rpx;
-  }
   .w-\[100px\] {
     width: 100px;
   }
@@ -278,9 +253,6 @@
   .flex-shrink {
     flex-shrink: 1;
   }
-  .border-collapse {
-    border-collapse: collapse;
-  }
   .transform {
     transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,);
   }
@@ -290,34 +262,10 @@
   .flex-wrap {
     flex-wrap: wrap;
   }
-  .items-center {
-    align-items: center;
-  }
-  .justify-center {
-    justify-content: center;
-  }
-  .rounded-full {
-    border-radius: calc(infinity * 1px);
-  }
   .border {
     border-style: var(--tw-border-style);
     border-width: 1px;
   }
-  .bg-\[blue\] {
-    background-color: blue;
-  }
-  .bg-\[red\] {
-    background-color: red;
-  }
-  .bg-\[transparent\] {
-    background-color: transparent;
-  }
-  .bg-white {
-    background-color: var(--color-white);
-  }
-  .p-0 {
-    padding: calc(var(--spacing) * 0);
-  }
   .p-0\! {
     padding: calc(var(--spacing) * 0) !important;
   }
@@ -327,12 +275,6 @@
   .pt-10 {
     padding-top: calc(var(--spacing) * 10);
   }
-  .pt-\[40px\] {
-    padding-top: 40px;
-  }
-  .pb-0 {
-    padding-bottom: calc(var(--spacing) * 0);
-  }
   .pb-0\! {
     padding-bottom: calc(var(--spacing) * 0) !important;
   }
@@ -354,32 +296,13 @@
     font-size: var(--text-xs);
     line-height: var(--tw-leading, var(--text-xs--line-height));
   }
-  .font-\[26rpx\] {
-    --tw-font-weight: 26rpx;
-    font-weight: 26rpx;
-  }
   .font-bold {
     --tw-font-weight: var(--font-weight-bold);
     font-weight: var(--font-weight-bold);
   }
-  .text-\[\#000\] {
-    color: #000;
-  }
   .text-\[\#7dc1f0\] {
     color: #7dc1f0;
   }
-  .text-\[\#fff\] {
-    color: #fff;
-  }
-  .text-\[\'10px\'\] {
-    color: '10px';
-  }
-  .text-\[\'12px\'\] {
-    color: '12px';
-  }
-  .text-\[26rpx\] {
-    color: 26rpx;
-  }
   .text-\[cadetblue\] {
     color: cadetblue;
   }
@@ -399,17 +322,6 @@
     --tw-ordinal: ordinal;
     font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,);
   }
-  .underline {
-    text-decoration-line: underline;
-  }
-  .shadow-\[0_0_10px_rgba\(0\,0\,0\,0\.1\)\] {
-    --tw-shadow: 0 0 10px var(--tw-shadow-color, rgba(0,0,0,0.1));
-    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  }
-  .shadow-\[0_0_10px_rgba\(0\,0\,0\,0\.05\)\] {
-    --tw-shadow: 0 0 10px var(--tw-shadow-color, rgba(0,0,0,0.05));
-    box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);
-  }
   .ring {
     --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor);
     box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow);

From b4585c93a69e7f8f7b87cd7ee3af26557ed27db8 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Mon, 1 Dec 2025 16:52:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=A4=B4=E5=83=8F=E6=94=B9=E4=B8=BA=E5=90=B4=E9=97=A8?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85logo=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E8=BE=93=E5=85=A5=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/profile/index.vue | 11 +++++------
 style/ui.scss                |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pages/user/profile/index.vue b/pages/user/profile/index.vue
index 6ca570c..6d54bd7 100644
--- a/pages/user/profile/index.vue
+++ b/pages/user/profile/index.vue
@@ -7,7 +7,7 @@
       <!-- 头像区域 -->
       <view class="avatar-section">
         <image 
-          :src="userInfo.avatar || defaultAvatar" 
+          :src="userInfo.avatar" 
           class="avatar"
           @click="editAvatar"
         />
@@ -148,7 +148,7 @@ const { t } = useI18n()
 const userStore = useUserStore()
 
 // 默认头像
-const defaultAvatar = '/static/home_icon.png'
+const defaultAvatar = '/static/logo.png'
 
 // 字段列表
 const fields = computed(() => [
@@ -200,10 +200,9 @@ const avatarUrl = ref('')
 const userInfo = ref<any>({}) // 用户信息
 const getData = async () => {
   const res = await getUserInfo()
-  if (res.result) {
-    userStore.setUserInfo(res.result)
-    userInfo.value = res.result
-  }
+  userStore.setUserInfo(res.result)
+  userInfo.value = res.result
+  userInfo.value.avatar = res.result.avatar || defaultAvatar
 }
 
 /**
diff --git a/style/ui.scss b/style/ui.scss
index 940e4b8..7e71e68 100644
--- a/style/ui.scss
+++ b/style/ui.scss
@@ -109,10 +109,10 @@ uni-textarea {
 
 // popup
 .wd-popup {
-	z-index: 9999 !important;
+	z-index: 99 !important;
 }
 .wd-overlay {
-	z-index: 9998 !important;
+	z-index: 98 !important;
 }
 .wd-popup-wrapper {
 	.wd-popup {

From 0ab55b538b3c14fd5e41071df55a267332feeb20 Mon Sep 17 00:00:00 2001
From: chenghuan <chenghuanv587@qq.com>
Date: Mon, 1 Dec 2025 17:58:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B9=A6=E7=B1=8D=E8=B4=AD=E4=B9=B0=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=92=8C=E7=AB=A0=E8=8A=82=E9=94=81=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/book/BookPrice.vue |  2 +-
 pages/book/detail.vue         |  2 +-
 pages/book/index.vue          |  2 +-
 pages/book/listen/index.vue   | 50 ++++++++++++++++++++++++++++-------
 pages/book/reader.vue         |  8 +++---
 pages/user/myBook/index.vue   |  2 +-
 6 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/components/book/BookPrice.vue b/components/book/BookPrice.vue
index 9306db0..5c186c3 100644
--- a/components/book/BookPrice.vue
+++ b/components/book/BookPrice.vue
@@ -3,7 +3,7 @@
     <view v-if="data.isBuy" class="book-flag">已购买</view>
     <view v-else-if="data.isVip == '0'" class="book-flag">免费</view>
     <view v-else-if="userHasVip && data.isVip == '1'" class="book-price">VIP免费</view>
-    <view v-else class="book-price">{{ item.minPrice }} {{ $t('global.coin') }}</view>
+    <view v-else class="book-price">{{ data.minPrice }} {{ $t('global.coin') }}</view>
     <view>
       <text v-if="data.readCount" class="book-flag">{{ `${data.readCount}${$t('bookHome.readingCount')}` }}</text>
       <text v-else-if="data.buyCount" class="book-flag">{{ `${data.buyCount}${$t('bookHome.purchased')}` }}</text>
diff --git a/pages/book/detail.vue b/pages/book/detail.vue
index 1c16ead..acab442 100644
--- a/pages/book/detail.vue
+++ b/pages/book/detail.vue
@@ -264,7 +264,7 @@ function handlePurchase(goods: IGoods) {
 
 // 页面跳转
 function goToReader() {
-  const isBuy = bookInfo.value.isBuy ? 0 : 1
+  const isBuy = bookInfo.value.isBuy ? 1 : 0
   const count = bookInfo.value.freeChapterCount || 0
   uni.navigateTo({
     url: `/pages/book/reader?isBuy=${isBuy}&bookId=${bookId.value}&count=${count}`
diff --git a/pages/book/index.vue b/pages/book/index.vue
index 9a7e60b..cc56798 100644
--- a/pages/book/index.vue
+++ b/pages/book/index.vue
@@ -329,7 +329,7 @@ const handleSearch = ({ value }: { value: string }) => {
  */
 const handleMyBookClick = (bookId: number) => {
   uni.navigateTo({
-    url: `/pages/book/reader?isBuy=0&bookId=${bookId}`
+    url: `/pages/book/reader?isBuy=1&bookId=${bookId}`
   })
 }
 
diff --git a/pages/book/listen/index.vue b/pages/book/listen/index.vue
index 85261d5..67e2bdb 100644
--- a/pages/book/listen/index.vue
+++ b/pages/book/listen/index.vue
@@ -19,7 +19,7 @@
           v-if="!bookInfo.isBuy" 
           type="primary"
           size="small"
-          @click="goToPurchase"
+          @click="purchaseVisible = true"
         >
           {{ $t('bookDetails.buy') }}
         </wd-button>
@@ -42,13 +42,21 @@
             <text class="chapter-text" :class="{ locked: isLocked(index) }">
               {{ chapter.chapter }}{{ chapter.content ? ' - ' + chapter.content : '' }}
             </text>
-            <wd-icon v-if="isLocked(index)" name="lock" size="20px" />
+            <wd-icon v-if="isLocked(index)" name="lock-on" size="20px" />
           </view>
         </view>
         
         <text v-else class="empty-text">{{ nullText }}</text>
       </view>
     </scroll-view>
+
+    <!-- 购买弹窗 -->
+    <GoodsSelector
+      :show="purchaseVisible"
+      :goods="goodsList"
+      @confirm="handlePurchase"
+      @close="closePurchasePopup"
+    />
   </view>
 </template>
 
@@ -58,7 +66,8 @@ import { onLoad } from '@dcloudio/uni-app'
 import { useI18n } from 'vue-i18n'
 import { bookApi } from '@/api/modules/book'
 import type { IBookDetail, IChapter } from '@/types/book'
-import CustomNavbar from '@/components/book/CustomNavbar.vue'
+import type { IGoods } from '@/types/order'
+import GoodsSelector from '@/components/order/GoodsSelector.vue'
 
 const { t } = useI18n()
 
@@ -80,11 +89,6 @@ const activeIndex = ref(-1)
 const nullText = ref('')
 const scrollHeight = ref(0)
 
-// 计算属性
-const isLocked = computed(() => (index: number) => {
-  return !bookInfo.value.isBuy && index + 1 > bookInfo.value.freeChapterCount
-})
-
 // 生命周期
 onLoad((options: any) => {
   if (options.bookId) {
@@ -98,8 +102,31 @@ onLoad((options: any) => {
   initScrollHeight()
   loadBookInfo()
   loadChapterList()
+  loadGoodsInfo()
 })
 
+// 购买弹窗状态
+const purchaseVisible = ref(false)
+const goodsList = ref<IGoods[]>([])
+
+// 关闭购买弹窗
+function closePurchasePopup() {
+  purchaseVisible.value = false
+}
+// 确认购买
+function handlePurchase(goods: IGoods) {
+  uni.navigateTo({
+    url: `/pages/order/goodsConfirm?goods=${goods.productId}`
+  })
+}
+
+
+// 加载购买商品信息
+async function loadGoodsInfo() {
+  const res = await bookApi.getBookGoods(bookId.value)
+  goodsList.value = res.productList || []
+}
+
 // 初始化滚动区域高度
 function initScrollHeight() {
   const systemInfo = uni.getSystemInfoSync()
@@ -134,10 +161,15 @@ async function loadChapterList() {
   }
 }
 
+// 判断章节是否锁定
+function isLocked(index: number): boolean {
+  return !bookInfo.value.isBuy && index + 1 > bookInfo.value.freeChapterCount
+}
+
 // 播放章节
 function playChapter(chapter: IChapter, index: number) {
   // 检查是否锁定
-  if (isLocked.value(index)) {
+  if (isLocked(index)) {
     uni.showToast({
       title: t('book.afterPurchase'),
       icon: 'none'
diff --git a/pages/book/reader.vue b/pages/book/reader.vue
index 038ba87..b804534 100644
--- a/pages/book/reader.vue
+++ b/pages/book/reader.vue
@@ -111,7 +111,7 @@
             <text class="chapter-text" :class="{ locked: isLocked(index) }">
               {{ chapter.chapter }}{{ chapter.content ? ' - ' + chapter.content : '' }}
             </text>
-            <wd-icon v-if="isLocked(index)" name="lock" size="20px" />
+            <wd-icon v-if="isLocked(index)" name="lock-on" size="20px" />
           </view>
         </scroll-view>
       </view>
@@ -201,7 +201,7 @@ const bookStore = useBookStore()
 
 // 路由参数
 const bookId = ref(0)
-const isBuy = ref('0')
+const isBuy = ref(false)
 const count = ref(0)
 
 // 数据状态
@@ -273,7 +273,7 @@ const currentChapterTitle = computed(() => {
 
 onLoad((options: any) => {
   if (options.bookId) bookId.value = Number(options.bookId)
-  if (options.isBuy) isBuy.value = options.isBuy
+  if (options.isBuy) isBuy.value = options.isBuy == 1 ? true : false
   if (options.count) count.value = Number(options.count)
   
   // 获取刘海高度
@@ -430,7 +430,7 @@ async function switchChapter(chapter: IChapter, index: number) {
 
 // 判断章节是否锁定
 function isLocked(index: number): boolean {
-  return isBuy.value === '1' && index + 1 > count.value
+  return !isBuy.value && index + 1 > count.value
 }
 
 // 判断是否是图片
diff --git a/pages/user/myBook/index.vue b/pages/user/myBook/index.vue
index 75ac5da..3142c46 100644
--- a/pages/user/myBook/index.vue
+++ b/pages/user/myBook/index.vue
@@ -68,7 +68,7 @@ function goToDetail(bookId: number) {
 
 function goToReader(bookId: number) {
   uni.navigateTo({
-    url: `/pages/book/reader?isBuy=0&bookId=${bookId}`
+    url: `/pages/book/reader?isBuy=1&bookId=${bookId}`
   })
 }