修复：内测问题修改：免费课程及课程详情代码优化、积分支付默认值、书籍价格显示

2025-12-01 16:39:58 +08:00
parent cd54ee48de
commit 1049030a46
15 changed files with 520 additions and 799 deletions
--- 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>
--- a/pages/course/details/components/CatalogueList.vue
+++ 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>
--- a/pages/course/details/components/CourseInfo.vue
+++ b/pages/course/details/components/CourseInfo.vue
@@ -0,0 +1,187 @@
+<template>
+  <view class="course-info">
+    <!-- 课程封面 -->
+    <view class="course-cover">
+      <image 
+        :src="course.image || '/static/nobg.jpg'" 
+        mode="widthFix"
+        class="cover-image"
+      />
+    </view>
+    
+    <!-- 课程标题 -->
+    <view class="course-title">
+      <text class="title-text">{{ course.title }}</text>
+    </view>
+    
+    <!-- 课程简介 -->
+    <view v-if="course.content && course.content !== ''" class="course-content">
+      <view class="content-wrapper">
+        <view 
+          :class="['content-html', isCollapsed ? 'collapsed' : '']"
+          v-html="parsedContent"
+        />
+        
+        <!-- 图片列表 -->
+        <view v-if="images.length > 0" class="content-images">
+          <image
+            v-for="(img, index) in images"
+            :key="index"
+            :src="img"
+            mode="widthFix"
+            class="content-image"
+            @click="previewImage(img, index)"
+          />
+        </view>
+        
+        <!-- 展开/收起按钮 -->
+        <view class="toggle-btn" @click="toggleContent">
+          <text>{{ isCollapsed ? '展开' : '收起' }}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import type { ICourseDetail } from '@/types/course'
+
+interface Props {
+  course: ICourseDetail
+}
+
+const props = defineProps<Props>()
+
+const isCollapsed = ref(true)
+const parsedContent = ref('')
+const images = ref<string[]>([])
+
+/**
+ * 解析课程内容，分离文本和图片
+ */
+const parseContent = () => {
+  if (!props.course.content) {
+    parsedContent.value = ''
+    images.value = []
+    return
+  }
+  
+  // 提取图片URL
+  const imgRegex = /<img[^>]+src="([^"]+)"[^>]*>/g
+  const imgUrls: string[] = []
+  let match
+  
+  while ((match = imgRegex.exec(props.course.content)) !== null) {
+    imgUrls.push(match[1])
+  }
+  
+  // 移除图片标签，保留文本内容
+  const cleanText = props.course.content.replace(/<img[^>]*>/g, '')
+  
+  parsedContent.value = cleanText
+  images.value = imgUrls
+}
+
+/**
+ * 切换展开/收起
+ */
+const toggleContent = () => {
+  isCollapsed.value = !isCollapsed.value
+}
+
+/**
+ * 预览图片
+ */
+const previewImage = (current: string, index: number) => {
+  uni.previewImage({
+    current,
+    urls: images.value,
+    currentIndex: index
+  })
+}
+
+// 监听课程变化，重新解析内容
+watch(() => props.course, () => {
+  parseContent()
+}, { immediate: true, deep: true })
+</script>
+
+<style lang="scss" scoped>
+.course-info {
+  background-color: #fff;
+}
+
+.course-cover {
+  width: 100%;
+  
+  .cover-image {
+    width: 100%;
+    display: block;
+  }
+}
+
+.course-title {
+  padding: 30rpx 20rpx;
+  
+  .title-text {
+    font-size: 36rpx;
+    font-weight: bold;
+    color: #333;
+    line-height: 1.4;
+  }
+}
+
+.course-content {
+  padding: 0 20rpx 20rpx;
+  
+  .content-wrapper {
+    position: relative;
+    
+    .content-html {
+      font-size: 28rpx;
+      line-height: 1.8;
+      color: #666;
+      text-align: justify;
+      word-break: break-all;
+      
+      &.collapsed {
+        max-height: 200rpx;
+        overflow: hidden;
+        position: relative;
+        
+        &::after {
+          content: '';
+          position: absolute;
+          bottom: 0;
+          left: 0;
+          right: 0;
+          height: 60rpx;
+          background: linear-gradient(to bottom, transparent, #fff);
+        }
+      }
+    }
+    
+    .content-images {
+      margin-top: 20rpx;
+      
+      .content-image {
+        width: 100%;
+        display: block;
+        margin-bottom: 20rpx;
+        border-radius: 8rpx;
+      }
+    }
+    
+    .toggle-btn {
+      text-align: right;
+      padding: 20rpx 0 0;
+      
+      text {
+        color: #838588;
+        font-size: 26rpx;
+      }
+    }
+  }
+}
+</style>
--- 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;
--- 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);