From da91e3cbb1191f5d0632f8e8d3dec6b31a1f04d2 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Fri, 27 Apr 2018 14:15:12 +0800
Subject: [PATCH] fix html

---
 .../static/analysis/templates/settlement_transactions.html  | 4 ----
 .../tradelog/templates/partner_settlement_dialog.html       | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index ec096566e..1cd046fa2 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -243,7 +243,6 @@
                     <th>Currency</th>
                     <th>Input Amount</th>
                     <th>Total Amount</th>
-                    <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
                     <th>Surcharge Amount</th>
                     <th>Settle Amount</th>
@@ -260,7 +259,6 @@
                     <td ng-bind="tr.transaction_currency"></td>
                     <td ng-bind="tr.display_amount|currency:''"></td>
                     <td ng-bind="tr.transaction_amount|currency:''"></td>
-                    <td ng-bind="tr.clearing_amount|currency:''"></td>
                     <td ng-bind="tr.surcharge_rate|percentage:1"></td>
                     <td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
                     <td ng-bind="tr.settle_amount|currency:''"></td>
@@ -281,7 +279,6 @@
                     <th>Transaction Time</th>
                     <th>Currency</th>
                     <th>Total Amount</th>
-                    <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
                     <th>Surcharge Amount</th>
                     <th>Settle Amount</th>
@@ -297,7 +294,6 @@
                     <td ng-bind="tr.transaction_time"></td>
                     <td ng-bind="tr.transaction_currency"></td>
                     <td ng-bind="tr.transaction_amount|currency:''"></td>
-                    <td ng-bind="tr.clearing_amount|currency:''"></td>
                     <td ng-bind="tr.surcharge_rate|percentage:1"></td>
                     <td ng-bind="(tr.total_surcharge?tr.total_surcharge:0)|currency:''"></td>
                     <td ng-bind="tr.settle_amount|currency:''"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 65513aaa8..aae9797c6 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -185,7 +185,6 @@
                     <th>Currency</th>
                     <th>Input Amount</th>
                     <th>Total Amount</th>
-                    <th>Clearing Amount</th>
                     <th>Surcharge Rate</th>
                     <th>Surcharge Amount</th>
                     <th>Tax Amount</th>
@@ -202,7 +201,6 @@
                     <td ng-bind="tr.transaction_currency"></td>
                     <td ng-bind="tr.display_amount"></td>
                     <td ng-bind="tr.transaction_amount"></td>
-                    <td ng-bind="tr.clearing_amount"></td>
                     <td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
                     <td ng-bind="tr.tax_amount"></td>
@@ -225,7 +223,7 @@
                     <th>Transaction Time</th>
                     <th>Currency</th>
                     <th>Total Amount</th>
-                    <th>Clearing Amount</th>
+                    <th>Settle Amount</th>
                     <th>Remark</th>
                 </tr>
                 </thead>
@@ -235,7 +233,7 @@
                     <td ng-bind="tr.transaction_time"></td>
                     <td ng-bind="tr.transaction_currency"></td>
                     <td ng-bind="tr.transaction_amount"></td>
-                    <td ng-bind="tr.clearing_amount"></td>
+                    <td ng-bind="tr.settle_amount"></td>
                     <td ng-bind="tr.remark"></td>
                 </tr>
                 </tbody>