From 2532aa055c0df42bb4696ce75410718e31df24d1 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 15 Oct 2025 11:40:13 +0800
Subject: [PATCH] =?UTF-8?q?10.15=E4=B8=8A=E5=8D=88=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                     |  9 ++++++++-
 pages_app/login/login.vue         |  4 ++--
 pages_app/newsList/newsList.vue   | 15 ++++++++++-----
 pages_app/ppt/ppt.vue             |  2 +-
 pages_app/pptDetail/pptDetail.vue |  2 +-
 pages_app/video/video.vue         |  6 +++---
 tsconfig.json                     |  1 +
 7 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/manifest.json b/manifest.json
index b75421b..ae811d8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,7 +81,14 @@
                 "push" : {
                     "unipush" : {
                         "version" : "2",
-                        "offline" : false
+                        "offline" : false,
+                        "honor" : {},
+                        "meizu" : {},
+                        "mi" : {},
+                        "vivo" : {},
+                        "oppo" : {},
+                        "hms" : {},
+                        "fcm" : {}
                     }
                 }
             },
diff --git a/pages_app/login/login.vue b/pages_app/login/login.vue
index ba7eac9..4d80f3c 100644
--- a/pages_app/login/login.vue
+++ b/pages_app/login/login.vue
@@ -160,7 +160,7 @@
 		
 		// #ifdef APP
 		uni.showToast({
-			title: '微信登录 11',
+			title: '微信登录',
 			icon: 'none'
 		});
 		// #endif
@@ -219,7 +219,7 @@
 							const app = getApp()
 							app.initNim({ account:result.data.YX_accid, token: result.data.YX_token })
 							// 跳转到首页
-							navTo({
+							uni.redirectTo({
 								url: '/pages/index/index'
 							})
 						}).catch(err=>{
diff --git a/pages_app/newsList/newsList.vue b/pages_app/newsList/newsList.vue
index b06c60d..ac97395 100644
--- a/pages_app/newsList/newsList.vue
+++ b/pages_app/newsList/newsList.vue
@@ -43,10 +43,10 @@
 		   <!-- 顶部轮播 -->
 		   <view class="banner-container">
 		   	<view class="swipemask">
-		   		<view class="banner-subtitle" v-if="bannerList.length>0">{{bannerList[currentBannerIndex].summary}}</view>	
+		   		<view class="banner-subtitle" v-if="bannerList.length>0">{{bannerList[currentBannerIndex].title}}</view>	
 		   		<view class="dotbox">
 		   			<view class="circle" :class="{active:currentBannerIndex==index} "v-for="(banner, index) in bannerList" 
-		   			:key="banner.id"></view>
+		   			:key="banner.id" ></view>
 		   		</view>
 		   	</view>
 		   	<swiper 
@@ -166,7 +166,12 @@
 	const onSwiperChange = (e) => {
 		currentBannerIndex.value = e.detail.current;
 	};
-
+   const playBannerVideo = (banner) => {
+	  let url=encodeURIComponent(docUrl+banner.path)
+		uni.navigateTo({
+			url: `/pages_app/webview/webview?url=${url}&title=${banner.title}`
+		});
+	};
 	// scroll-view 下拉刷新
 	const onRefresh = async () => {
 		console.log('scroll-view 下拉刷新触发');
@@ -604,8 +609,8 @@
 		position: fixed;
 		bottom:0;
 		width:100%;
-		top:200rpx;
-		height: calc(100vh - 200rpx); // 减去导航栏、标签栏和banner的高度
+		top:240rpx;
+		height: calc(100vh - 240rpx); // 减去导航栏、标签栏和banner的高度
 		background-color: #f8f8f8;
 	}
 
diff --git a/pages_app/ppt/ppt.vue b/pages_app/ppt/ppt.vue
index 5f62bc0..3febc56 100644
--- a/pages_app/ppt/ppt.vue
+++ b/pages_app/ppt/ppt.vue
@@ -539,7 +539,7 @@
 	
 	.courseware-list {
 		position: fixed;
-		top:240rpx;
+		top:280rpx;
 		flex: 1;
 		bottom:0;
 	   left:30rpx;
diff --git a/pages_app/pptDetail/pptDetail.vue b/pages_app/pptDetail/pptDetail.vue
index f895cc3..8edc920 100644
--- a/pages_app/pptDetail/pptDetail.vue
+++ b/pages_app/pptDetail/pptDetail.vue
@@ -135,7 +135,7 @@ const checkUser = async (options) => {
 
     // #ifdef APP-PLUS
     let wv = plus.webview.create("", "custom-webview", {
-      top: "140rpx",
+      top: "180rpx",
     });
     wv.loadURL(decodeURIComponent(options.src));
     let newstr = `document.cookie="hcp_token=${hcp_token.value};domain=.igandan.com;path=/;"`;
diff --git a/pages_app/video/video.vue b/pages_app/video/video.vue
index c6990c8..c02e21e 100644
--- a/pages_app/video/video.vue
+++ b/pages_app/video/video.vue
@@ -849,10 +849,10 @@
 .scroll-view {
 	position: fixed;
 	bottom:0rpx;
-	height: calc(100vh - 618rpx); /* 固定高度，减去固定的banner和Filter Tabs空间 */
+	height: calc(100vh - 658rpx); /* 固定高度，减去固定的banner和Filter Tabs空间 */
 	background-color: #f5f5f5;
 	margin-bottom: 200rpx;
-	top: 574rpx; /* 为固定的banner和Filter Tabs留出空间 */
+	top: 614rpx; /* 为固定的banner和Filter Tabs留出空间 */
 }
 
 /* Banner Styles */
@@ -967,7 +967,7 @@
 /* Fixed Filter Tabs Container */
 .filter-tabs-container {
 	position: fixed;
-	top: 540rpx; /* banner-container top + banner height */
+	top: 580rpx; /* banner-container top + banner height */
 	left: 0;
 	right: 0;
 	z-index: 40;
diff --git a/tsconfig.json b/tsconfig.json
index 213cada..1e00f83 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -44,3 +44,4 @@
 
 
 
+