From 9249b3fd7865f0b87ee2c4e58c388414cc4f4802 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Mon, 28 Mar 2022 18:28:47 +0800 Subject: [PATCH] =?UTF-8?q?ui=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/impls/ClientManagerImpl.java | 2 +- .../templates/partner_bankaccounts.html | 26 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 538195a04..6d0eb8c3d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -7535,7 +7535,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid config.put("enable_cross_payment",clientConfig.getBoolean("enable_cross_payment")); config.put("enable_card_payment",clientConfig.getBoolean("enable_card_payment")); config.put("manual", client.getBooleanValue("manual_settle") ); - config.put("min", client.getBigDecimal("min_settle")); + config.put("min", new BigDecimal( client.getString("min_settle")).toPlainString()); config.put("settle_hour", client.getInteger("settle_hour")); if (clientConfig == null) { clientConfig = new JSONObject(); diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index 470f68e0d..8adc19125 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -3,6 +3,18 @@ width: 95%; float: left; } + .panel-new { + margin-left: 20px; + margin-right: 20px; + background-color: #fff; + border: 1px solid transparent; + border-radius: 4px; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: 0 1px 1px rgba(0, 0, 0, .05); + } + .panel-info-new { + border-color: #bce8f1; + } .panel-heading-new { background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%); background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%); @@ -125,7 +137,7 @@ -
+

Cross Payment Settle Rule Config @@ -133,7 +145,7 @@

-
+
@@ -252,7 +264,7 @@
-
@@ -269,13 +281,13 @@
- -
+

Card Payment Settle Rule Config @@ -287,7 +299,7 @@

-
+
@@ -400,7 +412,7 @@
-