From 58e3314b5380efa9aafc8ad6f5549943242e2936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com> Date: Tue, 16 Jan 2024 15:22:46 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E4=B8=89=E4=B8=AA=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E5=AE=BD=E5=BA=A6=E5=92=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinancialReport/PayChannelStat/loadable.jsx | 2 +- .../FinancialReport/PdaStat/loadable.jsx | 2 +- src/pages/FinancialMgm/PayConf/AppConf/index.jsx | 3 +- src/pages/FinancialMgm/PayConf/AppConf/index.scss | 49 ++++++++++++---------- .../FinancialMgm/PayConf/PayMerchantConf/index.jsx | 3 +- .../PayConf/PayMerchantConf/index.scss | 49 ++++++++++++---------- .../PayConf/PlatformMerchantConf/index.jsx | 3 +- .../PayConf/PlatformMerchantConf/index.scss | 49 ++++++++++++---------- src/pages/FinancialMgm/PayRecordTotal/index.scss | 47 +++++++++++---------- src/pages/FinancialMgm/PayRecordTotal/loadable.jsx | 2 +- .../SettleBill/GeneralBusiness/loadable.jsx | 2 +- .../BusinessConfig/BusinessConf/index.scss | 20 +++++++-- .../BusinessConfig/BusinessConf/loadable.jsx | 1 + .../SystemMgm/BusinessConfig/HotCbdConf/index.scss | 9 +++- .../BusinessConfig/HotCbdConf/loadable.jsx | 3 +- .../SystemMgm/BusinessConfig/PageConf/index.scss | 23 ++++++---- .../SystemMgm/MessageMgm/ConfMes/loadable.jsx | 2 +- .../MessageMgm/NotificationMes/loadable.jsx | 2 +- 18 files changed, 158 insertions(+), 113 deletions(-) diff --git a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx index e7549e9..c029429 100644 --- a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx @@ -767,7 +767,7 @@ function PayChannelStat() { pagination={false} scroll={{ // x: 1000, - y: "350px", + y: "320px", }} /> diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx index 023fec3..9d9b815 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx @@ -614,7 +614,7 @@ function PdaStat() { pagination={false} scroll={{ // x: 1300, - y: "610px", + y: "580px", }} /> diff --git a/src/pages/FinancialMgm/PayConf/AppConf/index.jsx b/src/pages/FinancialMgm/PayConf/AppConf/index.jsx index 6fa139c..6096237 100644 --- a/src/pages/FinancialMgm/PayConf/AppConf/index.jsx +++ b/src/pages/FinancialMgm/PayConf/AppConf/index.jsx @@ -398,11 +398,12 @@ function AppConfiguration(props) { > row.id} dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{ y: "calc(100vh - 310px)" }} + scroll={{ y: "calc(100% - 50px)" }} loading={tabLoading} /> diff --git a/src/pages/FinancialMgm/PayConf/AppConf/index.scss b/src/pages/FinancialMgm/PayConf/AppConf/index.scss index abe1a87..455a721 100644 --- a/src/pages/FinancialMgm/PayConf/AppConf/index.scss +++ b/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; -} \ No newline at end of file +// ::-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; +// } \ No newline at end of file diff --git a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx index b124ab5..95a199e 100644 --- a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx +++ b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx @@ -704,11 +704,12 @@ function MerchantConfiguration(props) { >
row.id} dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{ y: "calc(100vh - 310px)" }} + scroll={{ y: "calc(100% - 50px)" }} loading={tabLoading} /> diff --git a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss index a9f1888..ce2a24a 100644 --- a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss +++ b/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; + // } diff --git a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx index 6a04cf1..db1ec97 100644 --- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx +++ b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx @@ -562,11 +562,12 @@ function PlatformConfiguration(props) { >
row.id} dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{ y: "calc(100vh - 310px)" }} + scroll={{ y: "calc(100% - 50px)" }} loading={tabLoading} /> diff --git a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss index ea0ec95..1435a35 100644 --- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss +++ b/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; - } \ No newline at end of file + // ::-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; + // } \ No newline at end of file diff --git a/src/pages/FinancialMgm/PayRecordTotal/index.scss b/src/pages/FinancialMgm/PayRecordTotal/index.scss index 25f7db7..d7bdaf8 100644 --- a/src/pages/FinancialMgm/PayRecordTotal/index.scss +++ b/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; -} \ No newline at end of file +// ::-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; +// } \ No newline at end of file diff --git a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx index 7d47f49..a3b4f8f 100644 --- a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx +++ b/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 }} /> diff --git a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx index b28a59b..7c40d54 100644 --- a/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/GeneralBusiness/loadable.jsx @@ -451,7 +451,7 @@ function GeneralBusiness() { dataSource={Data.data} pagination={false} scroll={{ - y: "610px", + y: "590px", }} /> diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss b/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss index fa79940..2d9f1aa 100644 --- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/index.scss +++ b/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; diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx index 2540295..f9e1ffd 100644 --- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx +++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx @@ -530,6 +530,7 @@ function BusinessConf(props) {
diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index 620da30..a15f62a 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/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} />