From 5849c567c5c31fb5981409aa306a62113752e459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=87=E8=88=AA?= <740464440@qq.com>
Date: Wed, 10 Jan 2024 15:00:37 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E6=B8=85=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E6=8B=89=E6=A1=86=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/MerchantMgm/InvoiceConf/index.scss    | 2 +-
 src/pages/MerchantMgm/MerchantAdmin/index.scss  | 2 +-
 src/pages/MerchantMgm/MerchantInfo/index.scss   | 2 +-
 src/pages/MerchantMgm/MerchantInfo/loadable.jsx | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/MerchantMgm/InvoiceConf/index.scss b/src/pages/MerchantMgm/InvoiceConf/index.scss
index 9f2f784..f1c80e9 100644
--- a/src/pages/MerchantMgm/InvoiceConf/index.scss
+++ b/src/pages/MerchantMgm/InvoiceConf/index.scss
@@ -146,7 +146,7 @@ $color-primary : var(--color-primary);
       box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
       .table {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100% - 50px - 40px);
         .ant-spin-nested-loading {
           height: 100%;
           .ant-spin-container {
diff --git a/src/pages/MerchantMgm/MerchantAdmin/index.scss b/src/pages/MerchantMgm/MerchantAdmin/index.scss
index 407ba2c..431a41c 100644
--- a/src/pages/MerchantMgm/MerchantAdmin/index.scss
+++ b/src/pages/MerchantMgm/MerchantAdmin/index.scss
@@ -136,7 +136,7 @@ $color-primary : var(--color-primary);
       box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
       .table {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100% - 50px - 40px);
         .ant-spin-nested-loading {
           height: 100%;
           .ant-spin-container {
diff --git a/src/pages/MerchantMgm/MerchantInfo/index.scss b/src/pages/MerchantMgm/MerchantInfo/index.scss
index 05073c9..93aad9f 100644
--- a/src/pages/MerchantMgm/MerchantInfo/index.scss
+++ b/src/pages/MerchantMgm/MerchantInfo/index.scss
@@ -146,7 +146,7 @@ $color-primary : var(--color-primary);
       box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
       .table {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100% - 50px - 40px);
         overflow-y: auto;
         @include scrollBar(var(--color-user-list-bg), #3B97FF);
         .ant-spin-nested-loading {
diff --git a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
index 2d9ac2a..ca725c3 100644
--- a/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
+++ b/src/pages/MerchantMgm/MerchantInfo/loadable.jsx
@@ -553,7 +553,6 @@ const MerchantInfo = (props) => {
       var zhiMiniFormValue = {}
       var weiPayFrom2Value = {}
       var weiMiniForm2Value = {}
-      systemForm的处理
       await systemForm.validateFields().then(async (value) => {
         var start = moment(value.last_time[0]?._d).format('YYYY-MM-DD HH:mm:ss')
         var end = moment(value.last_time[1]?._d).format('YYYY-MM-DD HH:mm:ss')
@@ -760,7 +759,7 @@ const MerchantInfo = (props) => {
               sort_percent: res?.data?.sort_percent || "",
               sort_cycle:  res?.data?.sort_cycle || "",
               sell_rate: res?.data?.sell_rate || "",
-              charge_type: res?.data?.charge_type || "",
+              charge_type: res?.data?.charge_type || null,
               sell_cycle: res?.data?.sell_cycle || "",
             })
           } else if (res?.data?.pay_type == 2) {