From 1ad851fb6f82c3b2cff6ff84cf83d64e4400e059 Mon Sep 17 00:00:00 2001
From: van <van333@foxmail.com>
Date: Tue, 7 Apr 2026 00:52:41 +0800
Subject: [PATCH] 1

---
 src/views/system/jdorder/orderList.vue | 71 ++++++++++++--------------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index d5e4882..d6be1c2 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -397,12 +397,13 @@
         </div>
         
         <!-- 桌面端表格 -->
-        <el-table v-else 
-          :data="list" 
-          v-loading="loading" 
-          border 
-          stripe 
-          :default-sort="{prop: 'createTime', order: 'descending'}" 
+        <el-table v-else
+          :data="list"
+          v-loading="loading"
+          border
+          stripe
+          height="calc(100% - 56px)"
+          :default-sort="{prop: 'createTime', order: 'descending'}"
           @sort-change="handleSortChange"
           @selection-change="handleSelectionChange"
           style="width: 100%;"
@@ -2894,31 +2895,6 @@ export default {
 </script>
 
 <style scoped>
-/* 优化表格滚动条 */
-.order-table ::v-deep .el-table__body-wrapper {
-  scrollbar-width: thick; /* Firefox */
-  scrollbar-color: #c1c1c1 #f1f1f1; /* Firefox */
-}
-
-.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  width: 12px;
-  height: 12px;
-}
-
-.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 6px;
-}
-
-.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 6px;
-  border: 2px solid #f1f1f1;
-}
-
-.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
-}
 
 /* 优化标签样式 */
 .order-table ::v-deep .el-tag {
@@ -3307,7 +3283,7 @@ export default {
 }
 
 .profit-summary-bar {
-  margin: 10px 0;
+  margin: 0 0 10px 0;
   padding: 8px 12px;
   background: #f4f6f9;
   border-radius: 4px;
@@ -3317,13 +3293,32 @@ export default {
 .sticky-summary {
   position: sticky;
   top: 0;
-  z-index: 21;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  z-index: 100;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
-.order-table ::v-deep .el-table__header-wrapper {
-  position: sticky;
-  top: 46px;
-  z-index: 20;
+/* 确保表格有正确的滚动条，横向滚动条始终可见 */
+.order-table ::v-deep .el-table__body-wrapper {
+  overflow-x: scroll !important;
+  overflow-y: auto;
+  /* 确保横向滚动条始终显示 */
+  scrollbar-width: thin;
+}
+/* 强制横向滚动条始终可见（Webkit浏览器） */
+.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
+  width: 12px;
+  height: 12px;
+}
+.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-track {
+  background: #f1f1f1;
+  border-radius: 6px;
+}
+.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 6px;
+  border: 2px solid #f1f1f1;
+}
+.order-table ::v-deep .el-table__body-wrapper::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
 }
 .profit-summary-item {
   margin-right: 20px;