From a1b1e91d4389142c89fba0841052e4d96664820f Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 26 Dec 2017 16:57:03 +0800
Subject: [PATCH 1/4] update
---
src/main/resources/templates/partner_apply_info.html | 2 --
src/main/resources/templates/refund_review.html | 2 +-
src/main/resources/templates/refund_review_client.html | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/partner_apply_info.html b/src/main/resources/templates/partner_apply_info.html
index fbbbab6ef..21c560e6c 100644
--- a/src/main/resources/templates/partner_apply_info.html
+++ b/src/main/resources/templates/partner_apply_info.html
@@ -78,8 +78,6 @@
});
-##
-
diff --git a/src/main/resources/templates/refund_review.html b/src/main/resources/templates/refund_review.html
index 6486400d6..83f4286c3 100644
--- a/src/main/resources/templates/refund_review.html
+++ b/src/main/resources/templates/refund_review.html
@@ -156,7 +156,7 @@
-
+
diff --git a/src/main/resources/templates/refund_review_client.html b/src/main/resources/templates/refund_review_client.html
index 7f5fc857b..fb371c9e5 100644
--- a/src/main/resources/templates/refund_review_client.html
+++ b/src/main/resources/templates/refund_review_client.html
@@ -58,7 +58,7 @@
-
+
From 44062991138f17c6899547206668b1cee0b9f612 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 26 Dec 2017 18:09:58 +0800
Subject: [PATCH 2/4] 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 83f4286c3..4ee135a55 100644
--- a/src/main/resources/templates/refund_review.html
+++ b/src/main/resources/templates/refund_review.html
@@ -24,7 +24,7 @@
var wdiv = $('#wdiv');
wdiv.show();
var fee = /*[[*{review.amount}]]*/0;
- var remark = /*[[*{review.remark}]]*/'';
+ var remark = /*[[*${review[remark]}]]*/'';
$.ajax({
url: '/api/payment/v1.0/refund/review/orders/' + '${review.order_id}',
method: 'POST',
@@ -199,14 +199,14 @@
-
+
From 516cb26e4643e07106d017c8956613093f7bbe82 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 26 Dec 2017 18:31:30 +0800
Subject: [PATCH 3/4] update
---
src/main/resources/templates/refund_review.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/templates/refund_review.html b/src/main/resources/templates/refund_review.html
index 4ee135a55..5397855ce 100644
--- a/src/main/resources/templates/refund_review.html
+++ b/src/main/resources/templates/refund_review.html
@@ -24,7 +24,7 @@
var wdiv = $('#wdiv');
wdiv.show();
var fee = /*[[*{review.amount}]]*/0;
- var remark = /*[[*${review[remark]}]]*/'';
+ var remark = /*[[*${review['remark']}]]*/'';
$.ajax({
url: '/api/payment/v1.0/refund/review/orders/' + '${review.order_id}',
method: 'POST',
From af5b164596bac662f09c0cc2dd5f7ee23dd5a803 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Tue, 26 Dec 2017 18:33:43 +0800
Subject: [PATCH 4/4] update
---
src/main/resources/templates/refund_review.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/resources/templates/refund_review.html b/src/main/resources/templates/refund_review.html
index 5397855ce..6ba8d64b0 100644
--- a/src/main/resources/templates/refund_review.html
+++ b/src/main/resources/templates/refund_review.html
@@ -7,7 +7,6 @@
- ##