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) {