From fb6497f19873faf99f47f5b479f360bdc75a5bd5 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Mon, 24 Mar 2025 08:48:41 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.22=20~=202025.03.23=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jiuyi2/api/video.js                           | 14 +++
 jiuyi2/pages.json                             |  3 +-
 jiuyi2/pages/index/dataCenter/pushHistory.vue | 86 ++++++++++++++++++-
 jiuyi2/pages/index/integralLog.vue            |  2 +-
 4 files changed, 102 insertions(+), 3 deletions(-)

diff --git a/jiuyi2/api/video.js b/jiuyi2/api/video.js
index 778dda36..36a5caee 100644
--- a/jiuyi2/api/video.js
+++ b/jiuyi2/api/video.js
@@ -600,6 +600,20 @@ const video = {
 			method: 'POST',
 		})
 	},
+
+	/**
+	 * 推流历史
+	 * @param {Object} param
+	 */
+	getVideoPushList(param) {
+		return util.request({
+			url: `/video/videoPushRecord/listById`,
+			load: true,
+			query: param.query,
+			data: param.data,
+			method: 'GET',
+		})
+	},
 }
 
 export default video
\ No newline at end of file
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index 34a9cb3a..cfa9e251 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -472,7 +472,8 @@
 			"path": "pages/index/dataCenter/pushHistory",
 			"style": {
 				"navigationBarTitleText": "历史推流",
-				"navigationBarBackgroundColor": "#fff"
+				"navigationBarBackgroundColor": "#fff",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
diff --git a/jiuyi2/pages/index/dataCenter/pushHistory.vue b/jiuyi2/pages/index/dataCenter/pushHistory.vue
index 9679ba36..d7c8beda 100644
--- a/jiuyi2/pages/index/dataCenter/pushHistory.vue
+++ b/jiuyi2/pages/index/dataCenter/pushHistory.vue
@@ -1,13 +1,97 @@
 <script setup>
 	// 推流历史
+	// 
+	import api from '@/api/index.js'
+	// 
+	import util from '@/common/js/util.js'
+	import {
+		ref,
+		reactive,
+	} from 'vue'
+	import {
+		onLoad,
+		onPullDownRefresh,
+		onReachBottom,
+	} from '@dcloudio/uni-app'
+
 	// 视频菜单
 	import videoMenu from '@/components/index/videoMenu.vue';
+	// 
+	const list = reactive({
+		data: [],
+		pageNum: 1,
+		pageSize: 18,
+		total: 0,
+	})
+
+	onLoad(() => {
+		// 获取列表
+		getList()
+	})
+
+	onPullDownRefresh(() => {
+		// 刷新列表
+		refreshList()
+	})
+
+	onReachBottom(() => {
+		// 获取更多列表
+		getMoreList()
+	})
+
+	// 刷新列表
+	function refreshList() {
+		list.pageNum = 1
+		getList()
+	}
+
+	// 获取更多列表
+	function getMoreList() {
+		if (list.total <= list.data.length) return
+		list.pageNum++
+		getList()
+	}
+
+	// 获取推流历史列表
+	function getList() {
+		api.video.getVideoPushList({
+			query: {
+				pageNum: list.pageNum,
+				pageSize: list.pageSize,
+			},
+		}).then(rs => {
+			if (rs.code == 200) {
+				// 第一页
+				if (list.pageNum == 1) list.data.length = 0
+				// 合并
+				list.data.push(...rs.rows.map(node => {
+					return node.video
+				}))
+				console.log('list', list)
+				// 总数
+				list.total = rs.total
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		}).finally(() => {
+			// 停止下拉刷新
+			uni.stopPullDownRefresh()
+		})
+	}
+
+	// 
+	function handleVideo() {
+		// 
+	}
 </script>
 
 <template>
 	<view class="appbw">
 		<view class="listBox">
-			<videoMenu :list="list.data" mode="menu" @item="handleVideo" />
+			<videoMenu :list="list.data" mode="list" @item="handleVideo" />
 		</view>
 	</view>
 </template>
diff --git a/jiuyi2/pages/index/integralLog.vue b/jiuyi2/pages/index/integralLog.vue
index 742539cb..e99b9a3c 100644
--- a/jiuyi2/pages/index/integralLog.vue
+++ b/jiuyi2/pages/index/integralLog.vue
@@ -47,7 +47,7 @@
 
 	// 刷新列表
 	function refreshList() {
-		scrollLog.homePageSize = 1
+		scrollLog.s = 1
 		getList()
 	}