diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index a749c28..2d1fa5c 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -136,7 +136,7 @@
     >
       <view class="goods-list-container">
         <!-- 网格布局 -->
-        <view class="grid-container" style="width: 725rpx; height: 1845rpx; display: flex; box-sizing: border-box">
+        <view class="grid-container" style="width: 725rpx; min-height: auto; height: auto; display: flex; box-sizing: border-box">
           <view 
             class="grid-item" 
             wx:for="{{filteredGoods}}" 
@@ -204,10 +204,11 @@
         </view>
         
         <!-- 无更多数据 -->
-        <view wx:if="{{!hasMoreData && filteredGoods.length > 0}}" class="no-more-data">
+        <view wx:if="{{filteredGoods.length > 0}}" class="no-more-data">
           <text>货源正在快马加鞭的赶来</text>
         </view>
         
+        
         <!-- 无商品时显示 -->
         <view wx:if="{{filteredGoods.length === 0 && !isLoading}}" class="empty-goods">
           <view class="empty-icon">📦</view>
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1ab4b60..57a50f1 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -103,8 +103,9 @@ page {
 .goods-list {
   flex: 1;
   padding-top: 240rpx;
-  height: 100%;
-  min-height: 100vh;
+  padding-bottom: 20rpx;
+  height: auto;
+  min-height: auto;
   box-sizing: border-box;
   overflow-y: auto;
   -webkit-overflow-scrolling: touch;
@@ -141,18 +142,15 @@ page {
 
 /* 确保滚动视图有正确的容器高度 */
 .goods-section {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   height: auto;
-  min-height: calc(100vh - 60rpx);
+  min-height: auto;
   position: relative;
   background: #f5f5f5;
-  padding-bottom: calc(env(safe-area-inset-bottom) );
-}
-
-.goods-list {
-  height: auto;
-  box-sizing: border-box;
-  background: #f5f5f5;
-  padding-bottom: calc(env(safe-area-inset-bottom) );
+  padding-bottom: calc(env(safe-area-inset-bottom) + 120rpx);
+  overflow: hidden;
 }
 
 /* 标题样式 */