From a38d3fcc9ddf27353700f351736e172c1eece74c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 18 May 2021 18:07:58 +0800
Subject: [PATCH] 20210518

---
 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
index 9d9478e..23addad 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -93,6 +93,14 @@
                     {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
                     {field: 'inviteIdTrader', title: '交易员邀请码', minWidth: 120,align:'left'},
                     {field: 'createTime', title: '时间', minWidth: 120,align:'center'},
+                    {field: 'positionType', title: '开仓类型',
+                        templet: function (d) {
+                            if (d.positionType === 1) {
+                                return '<span style="color:green;">分仓</span>'
+                            }else {
+                                return '<span style="color:red;">全仓</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
                     {field: 'contractType', title: '合约类型',
                         templet: function (d) {
                             if (d.contractType === 1) {
@@ -118,8 +126,10 @@
                                     return '<span style="color:red;">限价</span>'
                                 }
                             }, minWidth: 100,align:'center'},
+                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
                     {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
                     {field: 'symbolCntSale', title: '可平张数', minWidth: 120,align:'center'},
                     {field: 'rewardRatio', title: '实时盈亏', 
                     	templet: function (d) {
@@ -129,25 +139,23 @@
                                 return '<span style="color:red;">' + d.rewardRatio + '</span>'
                             }
                         },minWidth: 120,align:'center',totalRow: true},
-                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
-                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
                     {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
-                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},
-                    {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
-                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
-                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
-                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
-                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
-                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
-                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
                     {field: 'accountType', title: '账号类型',
-                    	templet: function (d) {
+                        templet: function (d) {
                             if (d.accountType === 2) {
                                 return '<span style="color:red;">测试账号</span>'
                             } else {
                                 return '<span style="color:green;">正常账号</span>'
                             }
                         },minWidth: 100,align:'center'},
+                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
+                    {field: 'holdAmount', title: '持仓手续费', minWidth: 120,align:'center',totalRow: true},
+                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
+                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
+                    {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+                    {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
+                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
+                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                 ]]
             });

--
Gitblit v1.9.1