From 71062c8e1342bd966a545ba432c1d612d3bcfabf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=85=E5=85=89=E5=AD=9F?= <fgmfjf@163.com>
Date: Mon, 9 Feb 2026 17:00:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DH5=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E4=B8=8B=E5=85=B3=E9=97=AD=E5=86=8D=E6=89=93=E5=BC=80=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/topNews/index.vue                   | 47 ++++++++++++-------
 .../components/u-calendar/u-calendar.vue      |  2 +
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/pages/topNews/index.vue b/src/pages/topNews/index.vue
index 8b3876b..ddd8aa2 100644
--- a/src/pages/topNews/index.vue
+++ b/src/pages/topNews/index.vue
@@ -32,7 +32,12 @@
     <!-- 24小时榜 end -->
     <view v-if="!loading" :class="['page-main ', { mask: !userStore.isLogin }]">
       <view class="news-list-top">
-        <view class="news-item" v-for="(item, index) in newsListTop" :key="item.news_id" @click="goDetail(item)">
+        <view
+          class="news-item"
+          v-for="(item, index) in newsListTop"
+          :key="item.news_id"
+          @click="goDetail(item)"
+        >
           <view class="news-no"> {{ index + 1 }} </view>
           <view class="news-info">
             <view class="news-title">
@@ -53,7 +58,12 @@
       </view>
 
       <view class="news-list">
-        <view class="news-item" v-for="(item, index) in newsList" :key="item.news_id" @click="goDetail(item)">
+        <view
+          class="news-item"
+          v-for="(item, index) in newsList"
+          :key="item.news_id"
+          @click="goDetail(item)"
+        >
           <view class="news-no"> {{ index + 1 + topNum }} </view>
           <view class="news-title">
             {{ item.title }}
@@ -89,16 +99,19 @@
     ></u-loading-icon>
 
     <!-- 日历 -->
-    <u-calendar
-      :show="calendarShow"
-      :min-date="calendar.minDate"
-      :max-date="calendar.maxDate"
-      :monthNum="calendar.monthNum"
-      :default-date="chooseDate.startDate"
-      @confirm="calendarConfirm"
-      @close="hideCalendar"
-    >
-    </u-calendar>
+    <view v-if="calendarShow">
+      <u-calendar
+        :show="true"
+        :min-date="calendar.minDate"
+        :max-date="calendar.maxDate"
+        :monthNum="calendar.monthNum"
+        :default-date="chooseDate.startDate"
+        closeOnClickOverlay
+        @confirm="calendarConfirm"
+        @close="hideCalendar"
+      >
+      </u-calendar>
+    </view>
 
     <!-- 登录弹窗 start -->
     <LoginDialog
@@ -119,7 +132,7 @@ import { useUserStore } from "@/stores/user";
 import RadarChat from "@/components/charts/Radar.vue";
 import LoginDialog from "@/components/loginPopup/index.vue";
 
-const userStore = useUserStore();// 登录弹框
+const userStore = useUserStore(); // 登录弹框
 const LoginShow = ref(false);
 
 // 显示弹框
@@ -196,7 +209,7 @@ const chooseDate = reactive({
 // 日历显示
 const calendarShow = ref(false);
 function showCalendar() {
-  if(!userStore.isLogin || !userStore.isUserType) return;
+  if (!userStore.isLogin || !userStore.isUserType) return;
   calendarShow.value = true;
 }
 // 隐藏日历
@@ -212,7 +225,7 @@ function calendarConfirm(dateList: string[]) {
   getNewsList();
   calendarShow.value = false;
   isExpAll.value = false;
-  lastNewsIndex.value = 10
+  lastNewsIndex.value = 10;
 }
 
 async function getNewsList() {
@@ -234,13 +247,13 @@ async function getNewsList() {
 }
 
 // 跳转详情
-function goDetail(item:any) {
+function goDetail(item: any) {
   if (userStore.isLogin) {
     uni.navigateTo({
       url: `/pages/detail/indexNewsInfo?id=${item.news_id}`,
     });
   } else {
-    handleShowLogin()
+    handleShowLogin();
   }
 }
 
diff --git a/src/uni_modules/uview-plus/components/u-calendar/u-calendar.vue b/src/uni_modules/uview-plus/components/u-calendar/u-calendar.vue
index ae91e21..c272f5a 100644
--- a/src/uni_modules/uview-plus/components/u-calendar/u-calendar.vue
+++ b/src/uni_modules/uview-plus/components/u-calendar/u-calendar.vue
@@ -225,11 +225,13 @@ export default {
 		},
 		close() {
 			this.$emit('close')
+			// this.scrollIntoView = ''; // 修复bug，在H5内，关闭再打开会重置到顶部区域的bug
 		},
 		// 点击确定按钮
 		confirm() {
 			if (!this.buttonDisabled) {
 				this.$emit('confirm', this.selected)
+				// this.scrollIntoView = ''; // 修复bug，在H5内，关闭再打开会重置到顶部区域的bug
 			}
 		},
 		// 获得两个日期之间的月份数