From c4353dbae165c282f14a9afe0a82c0c432a2a7e4 Mon Sep 17 00:00:00 2001 From: Tayl0r <519104047@qq.com> Date: Tue, 26 Dec 2017 14:39:20 +0800 Subject: [PATCH 1/9] remove forbidden scroll --- src/main/ui/static/templates/payment/v1/payment.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/ui/static/templates/payment/v1/payment.js b/src/main/ui/static/templates/payment/v1/payment.js index 70eded243..b017686be 100644 --- a/src/main/ui/static/templates/payment/v1/payment.js +++ b/src/main/ui/static/templates/payment/v1/payment.js @@ -4,11 +4,11 @@ $(function () { 'use strict'; - document.querySelector('body').addEventListener('touchmove', function(e) { - if (!document.querySelector('.coupons').contains(e.target)) { - e.preventDefault(); - } - }); + // document.querySelector('body').addEventListener('touchmove', function(e) { + // if (!document.querySelector('.coupons').contains(e.target)) { + // e.preventDefault(); + // } + // }); var dataCache = {price: '0', coupons: [], coupon_groups: {}}; var exchangeRate = 'CNY' == window.currency ? 1 : parseFloat(window.exchange_rate); dataCache.paying = false; From a8a7553b4b29e6c1f9523eae12900024d6c62e06 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 14:52:35 +0800 Subject: [PATCH 2/9] modify css --- src/main/resources/templates/paynotice.html | 2 +- src/main/resources/templates/refund_status.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/paynotice.html b/src/main/resources/templates/paynotice.html index a4aed4286..7c7b8f4f4 100644 --- a/src/main/resources/templates/paynotice.html +++ b/src/main/resources/templates/paynotice.html @@ -50,7 +50,7 @@ -
+
diff --git a/src/main/resources/templates/refund_status.html b/src/main/resources/templates/refund_status.html index e36ac08f5..55084797e 100644 --- a/src/main/resources/templates/refund_status.html +++ b/src/main/resources/templates/refund_status.html @@ -46,7 +46,7 @@ -
+
From a5f4d1fad57e541bd12d33df51391e70b21baac5 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 15:48:38 +0800 Subject: [PATCH 3/9] update --- .../listeners/NoticeRefundReviewListener.java | 2 +- .../resources/templates/refund_review.html | 223 ++++++++++++++++++ 2 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/templates/refund_review.html diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java index 0019e18aa..b45a43a0f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java @@ -55,7 +55,7 @@ public class NoticeRefundReviewListener implements ApplicationListener + +
+ + Refund Audition + + + + + ## + + + + + + +
+ + +
+
+ +
+
+
+
Refund Info.
+
+
+
+

Merchant Name

+
+
+
+
+
+

Avaliable Fee

+
+
+
+
+
+

Refund Fee

+
+
+
+
+
+

Opeartor

+
+
+
+
+
+

Apply Time

+
+
+
+
+
+
+

Remark

+
+
+
+
+
+
+

Order ID

+
+
+
+
+
+

Trade Time

+
+
+
+
+
+

Follow BD

+
+
+
+
+
+
+
Refund Auditon Status
+
+
+
+

Status

+
+
+
+
+
+ +
+
Refund Auditon Status
+
+
+
+

Status

+
+
+
+
+
+
+

Remark

+
+
+
+
+
+
+
+
+
+ Agree + Disagree +
+
+
+ + \ No newline at end of file From d5c18b68b5260451247ad39d16fdd9f16cfface0 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 16:00:17 +0800 Subject: [PATCH 4/9] update --- .../listeners/NoticeRefundReviewListener.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java index b45a43a0f..a6c2782a0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java @@ -38,7 +38,7 @@ public class NoticeRefundReviewListener implements ApplicationListener Date: Tue, 26 Dec 2017 16:06:22 +0800 Subject: [PATCH 5/9] update --- src/main/resources/templates/partner_apply_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/partner_apply_info.html b/src/main/resources/templates/partner_apply_info.html index 56454668e..e8fc5069c 100644 --- a/src/main/resources/templates/partner_apply_info.html +++ b/src/main/resources/templates/partner_apply_info.html @@ -152,7 +152,7 @@
From c0e8900f76580ba58d71cdca412300c754b0d3d3 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 16:12:18 +0800 Subject: [PATCH 6/9] update --- src/main/resources/templates/partner_apply_info.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/partner_apply_info.html b/src/main/resources/templates/partner_apply_info.html index e8fc5069c..ec026e168 100644 --- a/src/main/resources/templates/partner_apply_info.html +++ b/src/main/resources/templates/partner_apply_info.html @@ -152,7 +152,7 @@
From 90c3ca6633f92fb3365fc2111b8650ab37a7e5cd Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 16:15:02 +0800 Subject: [PATCH 7/9] update --- src/main/resources/templates/partner_apply_info.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/templates/partner_apply_info.html b/src/main/resources/templates/partner_apply_info.html index ec026e168..398193a1c 100644 --- a/src/main/resources/templates/partner_apply_info.html +++ b/src/main/resources/templates/partner_apply_info.html @@ -152,7 +152,7 @@
@@ -244,6 +244,7 @@
+##Button(初审)

@@ -252,5 +253,7 @@

+##Button(分配BD后审批) +##待加 \ No newline at end of file From dc50fa5ff8f6081b7ca59c613c63e1df107ff3c9 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 16:18:55 +0800 Subject: [PATCH 8/9] update --- src/main/resources/templates/partner_apply_info.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/templates/partner_apply_info.html b/src/main/resources/templates/partner_apply_info.html index 398193a1c..fbbbab6ef 100644 --- a/src/main/resources/templates/partner_apply_info.html +++ b/src/main/resources/templates/partner_apply_info.html @@ -244,7 +244,6 @@
-##Button(初审)

@@ -253,7 +252,5 @@

-##Button(分配BD后审批) -##待加 \ No newline at end of file From a1967376e149d47350653573d4d7cdf87094a03d Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Tue, 26 Dec 2017 16:27:18 +0800 Subject: [PATCH 9/9] update --- src/main/resources/templates/refund_review.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/refund_review.html b/src/main/resources/templates/refund_review.html index 07c90fc85..6486400d6 100644 --- a/src/main/resources/templates/refund_review.html +++ b/src/main/resources/templates/refund_review.html @@ -23,8 +23,8 @@ $('#agree-btn').click(function review() { var wdiv = $('#wdiv'); wdiv.show(); - var fee = /*[[*{clientMoniker}]]*/0; - var remark = /*[[*{clientMoniker}]]*/''; + var fee = /*[[*{review.amount}]]*/0; + var remark = /*[[*{review.remark}]]*/''; $.ajax({ url: '/api/payment/v1.0/refund/review/orders/' + '${review.order_id}', method: 'POST', @@ -50,7 +50,7 @@ $('#dialogSubmitBtn').click(function () { var wdiv = $('#wdiv'); wdiv.show(); - var rev = /*[[*{clientMoniker}]]*/null; + var rev = /*[[*{review}]]*/null; rev.description = $('#cancelText').val(); $.ajax({ url: '/api/payment/v1.0/refund/orders/offReview',