From 9347f79c607e1b503e03314f8ad612267c8543c3 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Tue, 25 Mar 2025 17:31:06 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.25=20=E5=B7=A5=E4=BD=9C=E4=BB=A3?=
 =?UTF-8?q?=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/common/js/config.js                   |  2 +-
 jiuyi2/common/js/util.js                     |  2 +-
 jiuyi2/components/index/appVerUpdate.vue     |  3 +-
 jiuyi2/components/mine/pushHistory.vue       |  9 ++-
 jiuyi2/pages/index/dataCenter/pushDetail.vue | 71 ++++++++++++++------
 jiuyi2/vite.config.js                        |  2 +-
 7 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/jiuyi2/api/video.js b/jiuyi2/api/video.js
index 36a5caee..9a53551e 100644
--- a/jiuyi2/api/video.js
+++ b/jiuyi2/api/video.js
@@ -614,6 +614,20 @@ const video = {
 			method: 'GET',
 		})
 	},
+
+	/**
+	 * 推流详情
+	 * @param {Object} param
+	 */
+	getVideoPushDetail(param) {
+		return util.request({
+			url: `/video/statistics/getparticulars`,
+			load: true,
+			query: param.query,
+			data: param.data,
+			method: 'GET',
+		})
+	},
 }
 
 export default video
\ No newline at end of file
diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index d31a3012..1d0e8e20 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -8,7 +8,7 @@ const config = {
 	// #ifndef H5
 	// host: 'http://91f.xyz:8080',
 	// host: 'http://liuyd.cpolar.top',
-	host: 'http://w7cega.natappfree.cc',
+	host: 'http://p9k42a.natappfree.cc',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,
diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js
index 8aaf8051..12b72bd9 100644
--- a/jiuyi2/common/js/util.js
+++ b/jiuyi2/common/js/util.js
@@ -1635,7 +1635,7 @@ const util = {
 		api.getAppVersion().then(rs => {
 			if (rs.code == 200) {
 				const result = rs.data
-				// console.log('getAppVersion result', result)
+				console.log('getAppVersion result', result)
 				// 同步修改云端数据
 				uni.$store.commit('setState', {
 					key: 'versionCloud',
diff --git a/jiuyi2/components/index/appVerUpdate.vue b/jiuyi2/components/index/appVerUpdate.vue
index bfc3d35b..a31176ba 100644
--- a/jiuyi2/components/index/appVerUpdate.vue
+++ b/jiuyi2/components/index/appVerUpdate.vue
@@ -62,8 +62,9 @@
 
 	// 取消
 	function handleCancel() {
+		console.log('versionCloud.value', versionCloud.value.isforce, versionCloud.value, )
 		// 判断是否强制更新
-		if (versionCloud.value.isforce == 1) plus.runtime.quit()
+		if (versionCloud.value.isForce == 1) plus.runtime.quit()
 		else close()
 	}
 
diff --git a/jiuyi2/components/mine/pushHistory.vue b/jiuyi2/components/mine/pushHistory.vue
index ecb3670d..38a2c5a0 100644
--- a/jiuyi2/components/mine/pushHistory.vue
+++ b/jiuyi2/components/mine/pushHistory.vue
@@ -70,11 +70,14 @@
 		})
 	}
 
-	// 点击了视频
-	function handleVideo() {
+	/**
+	 * 点击了视频
+	 * @param {Object} event
+	 */
+	function handleVideo(event) {
 		uni.navigateTo({
 			url: util.setUrl('/pages/index/dataCenter/pushDetail', {
-				// 
+				pushId: event.pushId,
 			})
 		})
 	}
diff --git a/jiuyi2/pages/index/dataCenter/pushDetail.vue b/jiuyi2/pages/index/dataCenter/pushDetail.vue
index 6aefece9..fc1b3453 100644
--- a/jiuyi2/pages/index/dataCenter/pushDetail.vue
+++ b/jiuyi2/pages/index/dataCenter/pushDetail.vue
@@ -1,22 +1,22 @@
 <script setup>
 	// 数据中心
 	import {
-		reactive
+		ref,
+		reactive,
 	} from 'vue';
+	import {
+		onLoad,
+	} from '@dcloudio/uni-app'
+	// 工具库
+	import util from '@/common/js/util';
+	// api请求体
+	import api from '@/api/index'
 	// 
 	import apex from '@/components/header/apex.vue'
 
 	// 图表数据
-	const chartData = reactive({
-		categories: ["1", "2", "3", "4", "5", "6", '7', '8', '9', '10', '11', '12', '13', '14', '15', '16', '17',
-			'18', '19', '20'
-		],
-		series: [{
-			name: "浏览推流",
-			data: [15, 14, 50, 37, 17, 38]
-		}, ]
-	})
-	// 配置项
+	const chartData = ref(null)
+	// 图表配置
 	const opts = reactive({
 		color: ["#C2ECFF", "#FFD2D2", "#C2FFCC", "#73C0DE", "#3CA272", "#FC8452", "#9A60B4", "#ea7ccc"],
 		padding: [0, 35, 0, 0],
@@ -55,6 +55,37 @@
 			},
 		}
 	})
+	// 推流id
+	const pushId = ref('')
+	// 推流详情
+	const pushDetail = reactive({})
+
+	onLoad((option) => {
+		// 推流id
+		if (option.pushId) pushId.value = option.pushId
+		// 获取推流详情
+		getDetail()
+	})
+
+	// 获取推流详情
+	function getDetail() {
+		api.video.getVideoPushDetail({
+			query: {
+				Id: pushId.value,
+			}
+		}).then(rs => {
+			if (rs.code == 200) {
+				Object.assign(pushDetail, rs.data)
+				// console.log('chartStatistics',)
+				chartData.value = pushDetail.chartStatistics
+				return
+			}
+			util.alert({
+				content: rs.msg,
+				showCancel: false,
+			})
+		})
+	}
 
 	/**
 	 * 跳转
@@ -75,20 +106,20 @@
 				<view class="title c333 f36 b">统计中心</view>
 			</view>
 			<!-- 查看时间 -->
-			<view class="line mt20 c999 f26">统计时间：2024.12.08 18:00</view>
+			<view class="line mt20 c999 f26">统计时间：{{pushDetail.statisticalTime}}</view>
 		</view>
 
 		<!-- 视频详情 -->
 		<view class="video df mtb20 ptb20 plr30 bfff">
-			<image class="poster br10" src="/static/openPage.png" mode=""></image>
+			<image class="poster br10" :src="pushDetail.coverUrl" mode="aspectFill"></image>
 			<view class="info df fdc jcsb f1 ml30">
-				<view class="title t2hd f34 c111">我上传了一个视频，这里是视频标题</view>
-				<view class="desc t2hd f28 c666">视频简介</view>
-				<view class="time f26 c999">2024年11月20日</view>
+				<view class="title t2hd f34 c111">{{pushDetail.title}}</view>
+				<view class="desc t2hd f28 c666">{{pushDetail.description}}</view>
+				<view class="time f26 c999">{{pushDetail.createTime}}</view>
 			</view>
 		</view>
 
-		<view class="container">
+		<view class="container" v-if="chartData">
 			<view class="rows">
 				<view class="title">流量统计</view>
 			</view>
@@ -105,17 +136,17 @@
 				<view class="main">
 					<view class="item tac">
 						<view class="key">推流消耗榴莲果</view>
-						<view class="value">10</view>
+						<view class="value">{{pushDetail.consumeFruit}}</view>
 					</view>
 					<!-- 点击订单 显示推广产生的订单列表 -->
 					<view class="item tac">
 						<view class="key">产生订单数量</view>
-						<view class="value">10</view>
+						<view class="value">{{pushDetail.numberOfOrders}}</view>
 					</view>
 					<!-- 增加明细列表 商品详情 订单号 显示分享收益详情 获取了多少积分/余额 -->
 					<view class="item tac">
 						<view class="key">商家推广返利</view>
-						<view class="value">10</view>
+						<view class="value">{{pushDetail.rebatePrice}}</view>
 					</view>
 				</view>
 			</view>
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index adb22a04..9757d71a 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -5,7 +5,7 @@ import uni from '@dcloudio/vite-plugin-uni';
 
 // let target = 'http://91f.xyz:8080'
 // let target = 'http://liuyd.cpolar.top '
-let target = 'http://w7cega.natappfree.cc'
+let target = 'http://p9k42a.natappfree.cc'
 
 export default defineConfig({
 	plugins: [uni()],