修复：图书详情和课程详情无数据问题
This commit is contained in:
@@ -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 () => {
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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()
|
||||
})
|
||||
|
||||
/**
|
||||
|
||||
@@ -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(() => {
|
||||
|
||||
Reference in New Issue
Block a user