From 22725b4c2eb3e5185606bf726c272cbb745a6081 Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 11:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A7=86=E9=A2=91=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/short_video/appSwiper/index.nvue  | 11 +++++--
 pages/short_video/nvueSwiper/index.nvue | 41 +++++++++++++++++++------
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 994a540..802388f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -704,8 +704,13 @@
 				// 					});
 				// 				})'
 				// that.isUser ?
-				videoList().then(res=>{
-						that.getVideoData(res.data.list);
+				videoList({
+							page: that.page,
+							limit: that.limit,
+							id:this.videoID
+						
+						}).then(res=>{
+				   that.getVideoData(res.data.list);
 				})
 				
 				
@@ -1325,7 +1330,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 120px;
+		bottom: 400rpx;
 		right: 10px;
 		display: flex;
 		align-items: center;
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 681e11a..7103afe 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -424,6 +424,7 @@
 				communityId: '',
 				Listcount: '',
 				loadMore: true,
+				videoshow:true
 			}
 		},
 		watch: {
@@ -741,9 +742,11 @@
 				}
 			},
 			get() {
+					
 				let that = this
+			
 				// 1.这里引入后端请求数据
-				    if(this.videoID){
+				    if(that.videoshow){
 						deoList(this.videoID).then(res => {
 							that.videoData([res.data])
 							if (res.data.list.length < that.limit) {
@@ -756,13 +759,32 @@
 								duration: 2000
 							});
 						})
-						this.videoID=''
+						this.videoshow=false
 					}else{
-						videoList().then(res=>{
-						  that.videoData(res.data.list);
-						})
-					}
-					
+						// videoList().then(res=>{
+						//   that.videoData(res.data.list);
+						// })
+							// console.log(that.userUid,that.videoID)
+						videoList({
+							page: that.page,
+							limit: that.limit,
+							id:this.videoID
+							// is_star: that.isSatrt,
+							// community_id: that.videoID
+						}).then(res => {
+							that.videoData(res.data.list)
+							if (res.data.list.length < that.limit) {
+								this.loadMore = false;
+							}
+						}).catch(err => {
+							return uni.showToast({
+								title: err,
+								icon: 'none',
+								duration: 2000
+							});
+						})	
+							}
+							
 				// that.isUser ?
 				// 	myVideoList(that.userUid, {
 				// 		page: that.page,
@@ -780,7 +802,8 @@
 				// 			icon: 'none',
 				// 			duration: 2000
 				// 		});
-				// 	}) :
+				// 	})
+				 //:
 				// 	graphicLstApi({
 				// 		page: that.page,
 				// 		limit: that.limit,
@@ -1412,7 +1435,7 @@
 
 	.userInfo {
 		position: absolute;
-		bottom: 60rpx;
+		bottom: 420rpx;
 		right: 20rpx;
 		flex-direction: column;
 		text-align: center;