From 8c7c2cadd5ec68b66b9a0c6afc0434c4513c1135 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Jun 2020 14:55:36 +0800
Subject: [PATCH] 20200623   代码提交

---
 src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
index 7601346..d33ddb1 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -134,8 +134,9 @@
                 elem: $view.find('table'),
                 id: 'userTable',
                 url: ctx + 'tradeManage/historyOrderInfo',
+                totalRow: true,
                 cols: [[
-                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
+                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
@@ -154,7 +155,7 @@
                             if (d.rewardAmount == 0 ||  d.rewardAmount == "" || d.rewardAmount == null) {
                                 return '<span></span>'
                             }
-                        },minWidth: 120,align:'center'},
+                        },minWidth: 120,align:'center',totalRow: true},
                     {field: 'openingPrice', title: '开仓价', 
                         	templet: function (d) {
                                 if (d.closingPrice > 0 || d.closingPrice < 0) {
@@ -179,9 +180,9 @@
                     {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
                     {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
                     {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
-                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'},
-                    {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center'},
-                    {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center'}
+                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
+                    {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
+                    {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true}
                 ]]
             });
         }

--
Gitblit v1.9.1