From b69588d11548473592c03c5e34f6300318612295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 3 Mar 2025 17:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/neworderStatistic.vue                | 16 ++++++++++++----
 .../uview-ui/components/u-popup/u-popup.vue      |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pages/index/neworderStatistic.vue b/pages/index/neworderStatistic.vue
index 53cacdc..51923ea 100644
--- a/pages/index/neworderStatistic.vue
+++ b/pages/index/neworderStatistic.vue
@@ -54,8 +54,8 @@
       >
       </u-empty>
     </view>
-    <u-popup round="55" :show="isShowPop" @close="closePop" @open="openPop" style="z-index: 10070; position: relative;">
-      <view class="popup-content">
+    <u-popup round="55" :show="isShowPop" @close="closePop" @open="openPop" :key="windowsHeight">
+      <view class="popup-content"  :style="{'height':windowsHeight + 'px'}">
         <view class="popup-header">
           <text>选择筛选项</text>
 
@@ -249,7 +249,8 @@ export default {
       selectTime: new Date().toString(),
       goodsList: [],
       isShowGoods: false,
-      goodsName: null
+      goodsName: null,
+      windowsHeight:600,
     }
   },
   onReachBottom() { // 当用户滚动到底部时触发
@@ -267,6 +268,12 @@ export default {
     headersVue
   },
   onReady() {
+    uni.getSystemInfo({
+      success: function(res) {
+        this.windowsHeight = res.windowHeight;
+        console.log('屏幕高度：', res.windowHeight);
+      }
+    });
     this.getTableData();
     this.getDictData();
     this.getCustomerSource();
@@ -560,7 +567,8 @@ export default {
 }
 
 .popup-content {
-  padding: 20rpx;
+  padding: 20rpx 20rpx 20rpx 20rpx;
+  overflow-y: scroll;
   background: white;
   border-radius: 20rpx;
   //height: 80vh;
diff --git a/uni_modules/uview-ui/components/u-popup/u-popup.vue b/uni_modules/uview-ui/components/u-popup/u-popup.vue
index 2ca51cc..eaa416d 100644
--- a/uni_modules/uview-ui/components/u-popup/u-popup.vue
+++ b/uni_modules/uview-ui/components/u-popup/u-popup.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="u-popup">
+	<view class="u-popup" >
 		<u-overlay
 			:show="show"
 			@click="overlayClick"
@@ -13,6 +13,7 @@
 			:customStyle="transitionStyle"
 			:mode="position"
 			:duration="duration"
+
 			@afterEnter="afterEnter"
 			@click="clickHandler"
 		>
@@ -152,7 +153,7 @@
 						style.borderTopRightRadius = value
 					} else if(this.mode === 'center') {
 						style.borderRadius = value
-					} 
+					}
 				}
 				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
 			},