From 3d387be4eb191337e3e8e1ceeefb0151bcb87bab Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Tue, 7 Jan 2025 11:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E6=8E=A5=E8=BF=BD?=
 =?UTF-8?q?=E5=89=A7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/emprty-card/emprty-card.vue      | 26 ++++++++
 pages/chasingDrama/index.vue                | 67 +++++----------------
 pages/watching_history/watching_history.vue | 14 ++---
 3 files changed, 47 insertions(+), 60 deletions(-)
 create mode 100644 components/emprty-card/emprty-card.vue

diff --git a/components/emprty-card/emprty-card.vue b/components/emprty-card/emprty-card.vue
new file mode 100644
index 0000000..09efd09
--- /dev/null
+++ b/components/emprty-card/emprty-card.vue
@@ -0,0 +1,26 @@
+<template>
+	<view class="container">
+		<up-empty :icon="props.icon" :text="props.text"></up-empty>
+	</view>
+</template>
+
+<script setup>
+const props = defineProps({
+	icon: {
+		type: String,
+		default: '/static/default/none.png'
+	},
+	text: {
+		type: String,
+		default: '空空如也~'
+	}
+});
+</script>
+
+<style scoped lang="scss">
+.container {
+	width: 100%;
+	display: flex;
+	justify-content: center;
+}
+</style>
diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue
index 3e87028..33a131c 100644
--- a/pages/chasingDrama/index.vue
+++ b/pages/chasingDrama/index.vue
@@ -7,57 +7,18 @@
 				<navigator class="more" url="/pages/watching_history/watching_history?type=3">更多</navigator>
 			</view>
 			<view class="list">
-				<view class="item">
+				<view class="item" v-for="item in data.list1" :key="item.id">
 					<view class="cover">
-						<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-						<view class="num">第三集</view>
+						<image class="img" :src="item.titleImg" mode="aspectFill"></image>
+						<view class="num">{{ item.courseDetailsName }}</view>
 					</view>
 					<view class="intro-wrap">
-						<view class="name">我在八十年代当后妈</view>
-						<view class="t">言情</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="cover">
-						<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-						<view class="num">第三集</view>
-					</view>
-					<view class="intro-wrap">
-						<view class="name">我在八十年代当后妈</view>
-						<view class="t">言情</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="cover">
-						<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-						<view class="num">第三集</view>
-					</view>
-					<view class="intro-wrap">
-						<view class="name">我在八十年代当后妈</view>
-						<view class="t">言情</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="cover">
-						<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-						<view class="num">第三集</view>
-					</view>
-					<view class="intro-wrap">
-						<view class="name">我在八十年代当后妈</view>
-						<view class="t">言情</view>
-					</view>
-				</view>
-				<view class="item">
-					<view class="cover">
-						<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-						<view class="num">第三集</view>
-					</view>
-					<view class="intro-wrap">
-						<view class="name">我在八十年代当后妈</view>
-						<view class="t">言情</view>
+						<view class="name">{{ item.title }}</view>
+						<view class="t">{{ item.courseLabel }}</view>
 					</view>
 				</view>
 			</view>
+			<emprty-card v-if="!data.list1.length" />
 		</view>
 		<view class="list-wrap">
 			<view class="title-wrap">
@@ -65,19 +26,20 @@
 				<navigator class="more" url="/pages/watching_history/watching_history?type=1">更多</navigator>
 			</view>
 			<view class="list">
-				<view class="item">
+				<view class="item" v-for="item in data.list2" :key="item.id">
 					<div class="item-content">
 						<view class="cover">
-							<image class="img" src="https://img0.baidu.com/it/u=966333451,3199467079&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=714" mode="aspectFill"></image>
-							<view class="num">第三集</view>
+							<image class="img" :src="item.titleImg" mode="aspectFill"></image>
+							<view class="num">{{ item.courseDetailsName }}</view>
 						</view>
 						<view class="intro-wrap">
-							<view class="name">我在八十年代当后妈</view>
-							<view class="t">言情</view>
+							<view class="name">{{ item.title }}</view>
+							<view class="t">{{ item.courseLabel }}</view>
 						</view>
 					</div>
 				</view>
 			</view>
+			<emprty-card v-if="!data.list2.length" />
 		</view>
 	</view>
 </template>
@@ -87,12 +49,13 @@ import { reactive } from 'vue';
 import { selectByUserId } from '@/api/me/me.js';
 import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app';
 
+// 获取数据
 async function selectByUserIdAjax() {
 	try {
 		const res1 = await selectByUserId({ page: 1, limit: 6, classify: 3 });
 		const res2 = await selectByUserId({ page: 1, limit: 6, classify: 6 });
-		console.log(res1);
-		console.log(res2);
+		data.list1 = res1.records;
+		data.list2 = res2.records;
 	} catch (error) {
 		console.log(error);
 	}
diff --git a/pages/watching_history/watching_history.vue b/pages/watching_history/watching_history.vue
index 6bf4a95..04447a4 100644
--- a/pages/watching_history/watching_history.vue
+++ b/pages/watching_history/watching_history.vue
@@ -19,7 +19,8 @@
 				</view>
 			</view>
 		</view>
-		<up-divider text="到底了~" v-if="listData.list.length && listData.finish"></up-divider>
+		<emprty-card v-if="!listData.list.length && listData.status == 'nomore'" />
+		<up-loadmore :status="listData.status" />
 	</view>
 </template>
 
@@ -45,7 +46,7 @@ const listData = reactive({
 	list: [],
 	page: 1,
 	size: 10,
-	finish: false
+	status: 'loading'
 });
 
 // 获取数据
@@ -56,12 +57,9 @@ async function selectByUserIdAjax() {
 			limit: listData.size,
 			classify: type.value
 		});
-		console.log(res);
-		if (res.code === 0) {
-			listData.list = res.data.records;
-			if (res.data.currPage >= res.data.totalPage) {
-				listData.finish = true;
-			}
+		listData.list = res.records;
+		if (res.currPage >= res.totalPage) {
+			listData.status = 'nomore';
 		}
 	} catch (error) {
 		console.log(error);