From cb57627169f288a1446ad554e957fa4e73aee220 Mon Sep 17 00:00:00 2001
From: sx <2427911852@qq.com>
Date: Mon, 17 Mar 2025 20:26:25 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.17=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/common/js/config.js               |  3 +-
 jiuyi2/components/index/appVerUpdate.vue |  2 +-
 jiuyi2/manifest.json                     |  4 +--
 jiuyi2/pages.json                        |  2 +-
 jiuyi2/pages/index/index.nvue            | 42 +++++++++++-------------
 jiuyi2/pages/index/wallet/topUp.vue      |  3 +-
 jiuyi2/vite.config.js                    |  1 +
 7 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js
index 36cfa819..e9007fd5 100644
--- a/jiuyi2/common/js/config.js
+++ b/jiuyi2/common/js/config.js
@@ -6,7 +6,8 @@ const config = {
 	// host: 'h5api',
 	// #endif
 	// #ifndef H5
-	host: 'http://91f.xyz:8080',
+	// host: 'http://91f.xyz:8080',
+	host: 'http://1d857465.r24.cpolar.top',
 	// #endif
 	// 是否vivo显示
 	showVivo: true,
diff --git a/jiuyi2/components/index/appVerUpdate.vue b/jiuyi2/components/index/appVerUpdate.vue
index 7d870e2d..bfc3d35b 100644
--- a/jiuyi2/components/index/appVerUpdate.vue
+++ b/jiuyi2/components/index/appVerUpdate.vue
@@ -36,7 +36,7 @@
 		// status 1更新 0未开启
 		if (result.status != 1) return
 		// 手机版本号 < 设定版本号
-		if (system.appVersionCode < result.versionCode) open()
+		if (versionkApp.appVersionCode < result.versionCode) open()
 	}
 
 	// 打开弹窗
diff --git a/jiuyi2/manifest.json b/jiuyi2/manifest.json
index b654ca9d..f1d688fc 100644
--- a/jiuyi2/manifest.json
+++ b/jiuyi2/manifest.json
@@ -2,8 +2,8 @@
     "name" : "九亿",
     "appid" : "__UNI__08B31BC",
     "description" : "",
-    "versionName" : "1.0.15",
-    "versionCode" : 1015,
+    "versionName" : "1.0.16",
+    "versionCode" : 1016,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/jiuyi2/pages.json b/jiuyi2/pages.json
index f5007c29..d2059573 100644
--- a/jiuyi2/pages.json
+++ b/jiuyi2/pages.json
@@ -882,7 +882,7 @@
 		"list": [
 			{
 				"name": "test",
-				"path": "pages/shop/shop"
+				"path": "pages/mine/mine"
 			},
 			{
 				"name": "test",
diff --git a/jiuyi2/pages/index/index.nvue b/jiuyi2/pages/index/index.nvue
index 565b5c4f..7ef7415a 100644
--- a/jiuyi2/pages/index/index.nvue
+++ b/jiuyi2/pages/index/index.nvue
@@ -230,11 +230,14 @@
 	})
 
 	onHide(() => {
-		// console.log('onHide', tabIndex.value, current, proxy.$refs)
-		const videoRefList = proxy.$refs[`videoRef${tabIndex.value}`]
+		// 上一个视频的id
+		const videoId = tabCurrent.value.listData()[current[tabIndex.value]].id
+
 		// 暂停视频
-		if (videoRefList) {
-			videoRefList[videoRefList.length - 2].pause()
+		if (videoId) {
+			// 视频组件
+			const VideoRef = proxy.$refs[`videoRef${videoId}`][0]
+			VideoRef.pause()
 			// videoRefList[current[tabIndex.value]].pause()
 		}
 	})
@@ -275,7 +278,6 @@
 
 	// 重载推荐列表
 	function refreshRecList() {
-		console.log('refreshRecList')
 		recList.pageNum = 1
 		recList.total = 0
 		getRecList()
@@ -290,7 +292,6 @@
 
 	// 获取推荐视频
 	function getRecList() {
-		console.log('getRecList')
 		// 获取首页分页视频
 		api.video.homeVideo({
 			query: {
@@ -299,7 +300,6 @@
 				pageSize: recList.pageSize,
 			}
 		}).then(rs => {
-			console.log('getRecList then')
 			handleListData(rs, recList)
 		})
 	}
@@ -449,29 +449,27 @@
 	 * @param {Number} target 滚动到下标的元素
 	 */
 	function scrollTo(target) {
-		console.log('scrollTo', proxy.$refs)
 		// tab下标
 		const tab_index = tabIndex.value
-
 		// 当前cell对象
 		const element = proxy.$refs[`cellRef${tab_index}`][target]
-		// 上一个视频组件
-		const lastVideoRef = proxy.$refs[`videoRef${tab_index}`][currentLast[tab_index]]
-
 		// 滚动到对应位置
 		dom.scrollToElement(element, {
 			animated: true
 		})
-
+		// 上一个视频的id
+		const videoId = tabCurrent.value.listData()[currentLast[tab_index]].id
+		// 上一个视频组件
+		const lastVideoRef = proxy.$refs[`videoRef${videoId}`][0]
 		// 如果视频切换
-		// if (current[tab_index] != currentLast[tab_index]) {
-		// 停止当前有效读秒统计
-		readSecondPause()
-		// 浏览记录
-		browseLog(lastVideoRef)
-		// 开始记录
-		readSecondAdd()
-		// }
+		if (current[tab_index] != currentLast[tab_index]) {
+			// 停止当前有效读秒统计
+			readSecondPause()
+			// 浏览记录
+			browseLog(lastVideoRef)
+			// 开始记录
+			readSecondAdd()
+		}
 	}
 
 	/**
@@ -816,7 +814,7 @@
 						v-for="(secItem,secIndex) in item.listData()" :key="secItem.id" @click.stop>
 						<template v-if="current[tabIndex] < secIndex + 2 && current[tabIndex] > secIndex - 2">
 							<!-- 视频 -->
-							<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[tabIndex]"
+							<indexVideo :ref="'videoRef' + secItem.id" :tabIndex="index" :current="current[tabIndex]"
 								:width="viewSize.width" :height="viewSize.height" :item="secItem" :index="secIndex"
 								@showTime="handleShowTime" @showComment="handleShowCommentAlt"
 								@showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend"
diff --git a/jiuyi2/pages/index/wallet/topUp.vue b/jiuyi2/pages/index/wallet/topUp.vue
index 167eca3b..9e34e5e7 100644
--- a/jiuyi2/pages/index/wallet/topUp.vue
+++ b/jiuyi2/pages/index/wallet/topUp.vue
@@ -89,7 +89,8 @@
 			if (rs.code == 200) {
 				uni.requestPayment({
 					provider: payment.value.provider,
-					orderInfo: rs.msg,
+					// orderInfo: rs.data,
+					package: `prepay_id=${rs.data.prepayId}`,
 					success: rs => {
 						console.log('requestPayment', rs)
 						util.getPurse()
diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js
index fc5535df..087c7113 100644
--- a/jiuyi2/vite.config.js
+++ b/jiuyi2/vite.config.js
@@ -4,6 +4,7 @@ import {
 import uni from '@dcloudio/vite-plugin-uni';
 
 let target = 'http://91f.xyz:8080'
+// let target = 'http://1d857465.r24.cpolar.top'
 
 export default defineConfig({
 	plugins: [uni()],