From 2fa219cfe04673055d81605e6adf67ce6f8b956c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=80=AA?= <690927457@qq.com>
Date: Fri, 29 Dec 2023 10:51:00 +0800
Subject: [PATCH] =?UTF-8?q?1229=2010:50=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/done.vue      | 5 ++++-
 pages/index/note_list.vue | 3 ++-
 pages/user/star.vue       | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pages/index/done.vue b/pages/index/done.vue
index a169c83..44d729e 100644
--- a/pages/index/done.vue
+++ b/pages/index/done.vue
@@ -11,6 +11,7 @@
 	import uniIcons from '@/uni_modules/uni-icons/components/uni-icons/uni-icons.vue' 
 	import ccNewsTabs from '@/uni_modules/cc-newsTabs/components/cc-newsTabs/cc-newsTabs.vue' 
 	const store = useStore()
+	import emptyCard from "@/components/emptyCard.vue"
 	// 生命周期
 	onLoad((e) => {
 		if(uni.getStorageSync('userInfo')) {
@@ -89,6 +90,7 @@
 		uni.showLoading({
 			mask:true
 		})
+		list_box.value[c_index.value].queryParams.userId = user_info.value?.userId || 0
 		const res = await api.getTodoist(list_box.value[c_index.value].queryParams,user_info.value?.userId || 0)
 		uni.hideLoading();
 		if(res.code === 0) {
@@ -172,7 +174,7 @@
 		<swiper :current="c_index" @change="scroll_func" :style="{'--size':swiper_h+'px'}" class="swiper" circular :indicator-dots="false" :autoplay="false" >
 			<swiper-item v-for="(item1,i1) in list_box">
 				<view class="todoBox">
-					<view v-for="(item,i) in item1.list" @tap="handle_func(item,i)" class="td-item swiper-item uni-bg-green">
+					<view v-for="(item,i) in item1.list" v-if="item1.list.length>0" @tap="handle_func(item,i)" class="td-item swiper-item uni-bg-green">
 						<view class="td-content text-ellipsis-2">
 							{{item.content}}
 						</view>
@@ -180,6 +182,7 @@
 							{{util.timestampToDate(item.CreatedAt)}}
 						</view>
 					</view>
+					<emptyCard v-else></emptyCard>
 				</view>
 			</swiper-item>
 		</swiper>
diff --git a/pages/index/note_list.vue b/pages/index/note_list.vue
index b132b63..503fd2c 100644
--- a/pages/index/note_list.vue
+++ b/pages/index/note_list.vue
@@ -190,7 +190,7 @@
 		<swiper :current="c_index" @change="scroll_func" :style="{'--size':swiper_h+'px'}" class="swiper" circular :indicator-dots="false" :autoplay="false" >
 			<swiper-item v-for="(item1,i1) in list_box">
 				<view class="todoBox">
-					<view v-for="(item,i) in item1.list" @tap="handle_func(item,i)" class="td-item swiper-item uni-bg-green">
+					<view v-for="(item,i) in item1.list" v-if="item1.list.length>0" @tap="handle_func(item,i)" class="td-item swiper-item uni-bg-green">
 						<view class="td-content text-ellipsis-2">
 							{{item.content}}
 						</view>
@@ -198,6 +198,7 @@
 							{{util.timestampToDate(item.CreatedAt)}}
 						</view>
 					</view>
+					<emptyCard v-else></emptyCard>
 				</view>
 			</swiper-item>
 		</swiper>
diff --git a/pages/user/star.vue b/pages/user/star.vue
index 9a6f4ff..c7a1444 100644
--- a/pages/user/star.vue
+++ b/pages/user/star.vue
@@ -71,9 +71,9 @@
 	}
 	function toDetail(item) {
 		let info = encodeURIComponent(JSON.stringify(item))
-		// console.log(info)
+		console.log(item)
 		uni.navigateTo({
-			url:"/pages/wikipedia/detail?info="+info+"&id="+item.id
+			url:"/pages/wikipedia/detail?info="+info+"&id="+item.ID
 		})
 	}
 </script>
@@ -82,11 +82,11 @@
 		<view class="list-box">
 			<view class="lb-card" v-if="list.length > 0" v-for="(item,i) in list" @tap="toDetail(item)">
 				<view class="lb-left">
-					<image :src="item.cover_img" mode="aspectFill"></image>
+					<image :src="item.cover" mode="aspectFill"></image>
 				</view>
 				<view class="lb-right">
 					<view class="lb-title">{{item.title}}</view>
-					<view class="lb-content text-ellipsis-1 small-text">{{item.content}}</view>
+					<view class="lb-content text-ellipsis-1 small-text">{{item.introduction}}</view>
 				</view>
 			</view>
 			<emptyCard v-else></emptyCard>