fix incremental surcharge rate

src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html

@@ -190,10 +190,10 @@
                         <span ng-if="tr.surcharge_rate">%</span>
                     </td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
-                    <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
-                    <td ng-if="source!='RP跨境商城'">0.00%</td>
-                    <td ng-if="source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
-                    <td ng-if="source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
+                    <td ng-if="tr.source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">0.00%</td>
+                    <td ng-if="tr.source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
                     <td ng-bind="tr.tax_amount"></td>
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>

src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html

@@ -192,10 +192,10 @@
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
                     <td>{{(((tr.surcharge_rate * 100) > tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):tr.surcharge_rate)| number : 2}}<span ng-if="tr.surcharge_rate">%</span></td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
-                    <td ng-if="source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
-                    <td ng-if="source!='RP跨境商城'">0.00%</td>
-                    <td ng-if="source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
-                    <td ng-if="source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
+                    <td ng-if="tr.source=='RP跨境商城'"><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">0.00%</td>
+                    <td ng-if="tr.source=='RP跨境商城'">{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
+                    <td ng-if="tr.source!='RP跨境商城'">{{0.00 | currency:tr.currency}}</td>
                     <td ng-bind="tr.tax_amount"></td>
                     <td ng-if="tr.settle_amount!=null" ng-bind="tr.settle_amount|currency:''"></td>
                     <td ng-bind="tr.remark"></td>