fix(): 修改系统管理商户管理财务管理三个模块的列表样式及滚动条宽度和样式等

src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx

@@ -767,7 +767,7 @@ function PayChannelStat() {
                   pagination={false}
                   scroll={{
                     // x: 1000,
-                    y: "350px",
+                    y: "320px",
                   }}
                 />
               </div>

src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx

@@ -614,7 +614,7 @@ function PdaStat() {
                   pagination={false}
                   scroll={{
                     // x: 1300,
-                    y: "610px",
+                    y: "580px",
                   }}
                 />
               </div>

src/pages/FinancialMgm/PayConf/AppConf/index.jsx

@@ -398,11 +398,12 @@ function AppConfiguration(props) {
             >
               <Table
                 // className="yisa-table"
+                className="yisa-table-scroll"
                 rowKey={(row) => row.id}
                 dataSource={resultData?.list || []}
                 columns={tableColumns}
                 pagination={false}
-                scroll={{ y: "calc(100vh - 310px)" }}
+                scroll={{ y: "calc(100% - 50px)" }}
                 loading={tabLoading}
               />
               <Pagination {...paginationProps} className="pagination-common" />

src/pages/FinancialMgm/PayConf/AppConf/index.scss

@@ -149,7 +149,12 @@ $color-primary : var(--color-primary);
       .cc-result-flow {
         width: 100%;
         height: calc(100% - 34px - 13px);
-
+        .ant-table-wrapper {
+          height: calc(100% - 45px);
+          .ant-table-body {
+            @include scrollBar(var(--color-user-list-bg), #3b97ff);
+          }
+        }
         .yisa-table {
           width: 100%;
           height: calc(100% - 32px - 15px);
@@ -221,24 +226,24 @@ $color-primary : var(--color-primary);
 }
 /*定义滚动条高宽及背景
  高宽分别对应横竖滚动条的尺寸*/
-::-webkit-scrollbar {
-  width: 6px;
-  height: 16px;
-  background-color: #5c5c5c;
-}
-
-/*定义滚动条轨道
-  内阴影+圆角*/
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  border-radius: 10px;
-  background-color: #9da2ab;
-}
-
-/*定义滑块
-  内阴影+圆角*/
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-  background-color: #3b97ff;
-}
+// ::-webkit-scrollbar {
+//   width: 6px;
+//   height: 16px;
+//   background-color: #5c5c5c;
+// }
+
+// /*定义滚动条轨道
+//   内阴影+圆角*/
+// ::-webkit-scrollbar-track {
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   border-radius: 10px;
+//   background-color: #9da2ab;
+// }
+
+// /*定义滑块
+//   内阴影+圆角*/
+// ::-webkit-scrollbar-thumb {
+//   border-radius: 10px;
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+//   background-color: #3b97ff;
+// }

src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx

@@ -704,11 +704,12 @@ function MerchantConfiguration(props) {
             >
               <Table
                 // className="yisa-table"
+                className="yisa-table-scroll"
                 rowKey={(row) => row.id}
                 dataSource={resultData?.list || []}
                 columns={tableColumns}
                 pagination={false}
-                scroll={{ y: "calc(100vh - 310px)" }}
+                scroll={{ y: "calc(100% - 50px)" }}
                 loading={tabLoading}
               />
               <Pagination {...paginationProps} className="pagination-common" />

src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss

@@ -149,7 +149,12 @@ $color-primary : var(--color-primary);
       .cc-result-flow {
         width: 100%;
         height: calc(100% - 34px - 13px);
-
+        .ant-table-wrapper {
+          height: calc(100% - 45px);
+          .ant-table-body {
+            @include scrollBar(var(--color-user-list-bg), #3b97ff);
+          }
+        }
         .yisa-table {
           width: 100%;
           height: calc(100% - 32px - 15px);
@@ -213,24 +218,24 @@ $color-primary : var(--color-primary);
 
   /*定义滚动条高宽及背景
  高宽分别对应横竖滚动条的尺寸*/
-  ::-webkit-scrollbar {
-    width: 6px;
-    height: 16px;
-    background-color: #5c5c5c;
-  }
-
-  /*定义滚动条轨道
-  内阴影+圆角*/
-  ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    border-radius: 10px;
-    background-color: #9da2ab;
-  }
-
-  /*定义滑块
-  内阴影+圆角*/
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-    background-color: #3b97ff;
-  }
+  // ::-webkit-scrollbar {
+  //   width: 6px;
+  //   height: 16px;
+  //   background-color: #5c5c5c;
+  // }
+
+  // /*定义滚动条轨道
+  // 内阴影+圆角*/
+  // ::-webkit-scrollbar-track {
+  //   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  //   border-radius: 10px;
+  //   background-color: #9da2ab;
+  // }
+
+  // /*定义滑块
+  // 内阴影+圆角*/
+  // ::-webkit-scrollbar-thumb {
+  //   border-radius: 10px;
+  //   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  //   background-color: #3b97ff;
+  // }

src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx

@@ -562,11 +562,12 @@ function PlatformConfiguration(props) {
             >
               <Table
                 // className="yisa-table"
+                className="yisa-table-scroll"
                 rowKey={(row) => row.id}
                 dataSource={resultData?.list || []}
                 columns={tableColumns}
                 pagination={false}
-                scroll={{ y: "calc(100vh - 310px)" }}
+                scroll={{ y: "calc(100% - 50px)" }}
                 loading={tabLoading}
               />
               <Pagination {...paginationProps} className="pagination-common" />

src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss

@@ -149,7 +149,12 @@ $color-primary : var(--color-primary);
       .cc-result-flow {
         width: 100%;
         height: calc(100% - 34px - 13px);
-
+        .ant-table-wrapper {
+          height: calc(100% - 45px);
+          .ant-table-body {
+            @include scrollBar(var(--color-user-list-bg), #3b97ff);
+          }
+        }
         .yisa-table {
           width: 100%;
           height: calc(100% - 32px - 15px);
@@ -228,24 +233,24 @@ $color-primary : var(--color-primary);
 
   /*定义滚动条高宽及背景
  高宽分别对应横竖滚动条的尺寸*/
-  ::-webkit-scrollbar {
-    width: 6px;
-    height: 16px;
-    background-color: #5c5c5c;
-  }
-
-  /*定义滚动条轨道
-  内阴影+圆角*/
-  ::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-    border-radius: 10px;
-    background-color: #9da2ab;
-  }
-
-  /*定义滑块
-  内阴影+圆角*/
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-    background-color: #3b97ff;
-  }
+  // ::-webkit-scrollbar {
+  //   width: 6px;
+  //   height: 16px;
+  //   background-color: #5c5c5c;
+  // }
+
+  // /*定义滚动条轨道
+  // 内阴影+圆角*/
+  // ::-webkit-scrollbar-track {
+  //   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  //   border-radius: 10px;
+  //   background-color: #9da2ab;
+  // }
+
+  // /*定义滑块
+  // 内阴影+圆角*/
+  // ::-webkit-scrollbar-thumb {
+  //   border-radius: 10px;
+  //   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  //   background-color: #3b97ff;
+  // }

src/pages/FinancialMgm/PayRecordTotal/index.scss

@@ -10,7 +10,7 @@ $color-primary : var(--color-primary);
   padding-top: 10px;
   width: 100%;
   height: 100%;
-  overflow-y: auto;
+  // overflow-y: auto;
   @include scrollBar(var(--color-user-list-bg), #3B97FF);
 
   .paid-search {
@@ -149,7 +149,10 @@ $color-primary : var(--color-primary);
       .cc-result-flow {
         width: 100%;
         height: calc(100% - 34px - 13px);
+        .ant-table-body {
+          @include scrollBar(var(--color-user-list-bg), #3B97FF);
 
+        }
         .yisa-table {
           width: 100%;
           height: calc(100% - 32px - 15px);
@@ -214,24 +217,24 @@ $color-primary : var(--color-primary);
 
 /*定义滚动条高宽及背景
  高宽分别对应横竖滚动条的尺寸*/
-::-webkit-scrollbar {
-  width: 6px;
-  height: 16px;
-  background-color: #5c5c5c;
-}
-
-/*定义滚动条轨道
-  内阴影+圆角*/
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  border-radius: 10px;
-  background-color: #9da2ab;
-}
-
-/*定义滑块
-  内阴影+圆角*/
-::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-  background-color: #3b97ff;
-}
+// ::-webkit-scrollbar {
+//   width: 6px;
+//   height: 16px;
+//   background-color: #5c5c5c;
+// }
+
+// /*定义滚动条轨道
+//   内阴影+圆角*/
+// ::-webkit-scrollbar-track {
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   border-radius: 10px;
+//   background-color: #9da2ab;
+// }
+
+// /*定义滑块
+//   内阴影+圆角*/
+// ::-webkit-scrollbar-thumb {
+//   border-radius: 10px;
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+//   background-color: #3b97ff;
+// }

src/pages/FinancialMgm/PayRecordTotal/loadable.jsx

@@ -470,7 +470,7 @@ function PayRecordTotal(props) {
                 columns={tableColumns}
                 pagination={false}
                 loading={tabLoading}
-                scroll={{ y: 620 }}
+                scroll={{ y: 610 }}
               />
               <Pagination {...paginationProps} className="pagination-common" />
             </ResultFlowResult>

src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx

@@ -451,7 +451,7 @@ function GeneralBusiness() {
                 dataSource={Data.data}
                 pagination={false}
                 scroll={{
-                  y: "610px",
+                  y: "590px",
                 }}
               />
             </div>

src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss

@@ -8,6 +8,7 @@ $color-primary: var(--color-primary);
   display: flex;
   padding: 15px;
   width: 100%;
+  height: 100%;
   .paid-search {
     .search {
       font-size: 16px;
@@ -81,11 +82,12 @@ $color-primary: var(--color-primary);
 
   .paid-result {
     width: 100%;
-    height: 800px;
+    height: 100%;
     background: #505a6f;
     border-radius: 20px;
     margin-left: 17px;
     .result {
+      height: 100%;
       padding: 25px;
       .font {
         font-family:
@@ -102,6 +104,16 @@ $color-primary: var(--color-primary);
           margin: 0 5px;
         }
       }
+      .cc-result-flow {
+      width: 100%;
+      height: calc(100% - 34px - 13px);
+      .ant-table-wrapper {
+        height: calc(100% - 45px);
+        .ant-table-body {
+          @include scrollBar(var(--color-user-list-bg), #3b97ff);
+        }
+      }
+    }
       .yisa-table .ant-table-thead .ant-table-cell {
         background-color: #616b83 !important;
         color: #ffffff !important;
@@ -125,17 +137,17 @@ $color-primary: var(--color-primary);
         overflow: auto;
       }
       .ant-table-content::-webkit-scrollbar {
-        width: 5px;
+        width: 12px;
       }
       .ant-table-content::-webkit-scrollbar-thumb {
         background-color: #9da2ab;
-        border-radius: 10px;
+        border-radius: 4px;
       }
       .ant-table-content::-webkit-scrollbar-track {
         /*滚动条里面轨道*/
         -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
         border-radius: 10px;
-        background: #ffffff;
+        background: transparent;
       }
       .ant-table-tbody .ant-table-row .ant-table-cell {
         background-color: #3e4557 !important;

src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx

@@ -530,6 +530,7 @@ function BusinessConf(props) {
                         <Table
                             bordered
                             // className='yisa-table'
+                            className="yisa-table-scroll"
                             dataSource={resultData.data}
                             columns={
                                 handleColumns()

src/pages/SystemMgm/BusinessConfig/HotCbdConf/index.scss

@@ -12,8 +12,13 @@ $color-primary : var(--color-primary);
     }
 
     .table-wrap{
-        height: calc(100% - 60px);
-       
+        height: calc(100% - 40px - 47px);
+        .ant-table-wrapper {
+            height: calc(100% );
+            .ant-table-body {
+              @include scrollBar(var(--color-user-list-bg), #3b97ff);
+            }
+          }
     }
 
     .ant-table-body{

src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx

@@ -366,8 +366,9 @@ function HotCbdConf() {
                     <div className="table-wrap" >
                         <Table
                             rowKey="id"
+                            className="yisa-table-scroll"
                             dataSource={resultData}
-                            scroll={{y: 'calc(100vh - 300px)'}}
+                            scroll={{y: 'calc(100% - 50px)'}}
                             loading={tableLoading}
                             columns={columns}
                             pagination={false}

src/pages/SystemMgm/BusinessConfig/PageConf/index.scss

@@ -25,16 +25,21 @@ $color-primary : var(--color-primary);
             }
         }
     }
-
-    .ant-table-body{
-        &::-webkit-scrollbar{
-            background-color: #3e4557;
-            width: 5px;
+    .ant-table-wrapper {
+        // height: calc(100% );
+        .ant-table-body {
+          @include scrollBar(var(--color-user-list-bg), #3b97ff);
         }
+      }
+    // .ant-table-body{
+    //     &::-webkit-scrollbar{
+    //         background-color: #3e4557;
+    //         width: 12px;
+    //     }
 
-        &::-webkit-scrollbar-thumb{
-            background-color: #616b83;
-        }
-    }
+    //     &::-webkit-scrollbar-thumb{
+    //         background-color: #9da2ab;
+    //     }
+    // }
 
 }

src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx

@@ -448,7 +448,7 @@ function ConfMes(props) {
                             dataSource={resultData?.list || []}
                             columns={tableColumns}
                             pagination={false}
-                            scroll={{y: 640}}
+                            scroll={{y: 610}}
                             loading={loading}
                         />
                         <Pagination {...paginationProps} className="pagination-common" />

src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx

@@ -492,7 +492,7 @@ function NotificationMes(props) {
                             dataSource={resultData?.list || []}
                             columns={tableColumns}
                             pagination={false}
-                            scroll={{y: 640}}
+                            scroll={{y: 610}}
                             loading={loading}
                         />
                         <Pagination {...paginationProps} className="pagination-common" />