diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java index f7cc47bcb..56cc96a55 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/web/DashboardController.java @@ -108,7 +108,7 @@ public class DashboardController { } @ManagerMapping("/new_clients") - public List clientsTradeInDays(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { + public List clientsTradeInDays(AnalysisBean analysis, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { JSONObject params = analysis.toParams(null); orgManager.checkOrg(manager,params); return dashboardService.getClientsTradeAnalysisInDays(params); 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 a809bffdb..571e74f66 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 @@ -112,6 +112,7 @@ import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; +import org.apache.el.parser.AstNot; import org.dom4j.Element; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/ui/static/lib/weui/index.css b/src/main/ui/static/lib/weui/index.css index a75c74ecb..7dbe43e45 100644 --- a/src/main/ui/static/lib/weui/index.css +++ b/src/main/ui/static/lib/weui/index.css @@ -37,7 +37,7 @@ margin-top: 6px; } .weui-wepay-details__bd { - padding: 12px 0; + /*padding: 8px 0;*/ } .weui-wepay-details__line { margin-top: 7px; @@ -63,7 +63,7 @@ display: flex; justify-content: space-between; font-size: 14px; - line-height: 30px; + line-height: 26px; } .weui-wepay-detail__hd { text-align: left; diff --git a/src/main/ui/static/templates/payment/success.css b/src/main/ui/static/templates/payment/success.css index 89a829205..4abfb0e03 100644 --- a/src/main/ui/static/templates/payment/success.css +++ b/src/main/ui/static/templates/payment/success.css @@ -1,5 +1,5 @@ .pagehead { - padding: 10px 0; + padding: 5px 0; color: white; background-color: #09bb07; } @@ -13,8 +13,8 @@ background-color: #23ac38; } .pagehead img { - width: 40px; - height: 40px; + width: 30px; + height: 30px; border: 3px solid white; border-radius: 50%; vertical-align: middle; @@ -31,15 +31,15 @@ } .pright { - font-size: 24px; + font-size: 20px; position: absolute; right: 10%; - padding-top: 5px; + padding-top: 2px; vertical-align: middle; } .afterhr { - padding: 5px 0; + /*padding: 5px 0;*/ content: " "; position: relative; bottom: 0; @@ -51,7 +51,7 @@ } .ad { - padding: 15px 0; + /*padding: 5px 0 0 0;*/ text-align: center; margin: auto;