From c862fe9bc15ee01a3aa1e8b09146a8084d5b8ee7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Jul 2020 12:16:30 +0800
Subject: [PATCH] 20200717  代码提交

---
 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html |   46 +++++++++++++++++++++-------------------------
 1 files changed, 21 insertions(+), 25 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 288da5a..d9e7b67 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -30,24 +30,6 @@
         </div>
     </div>
 </div>
-<script type="text/html" id="tradeType">
-    {{#
-    var tradeType = {
-    1: {title: '市价' , color: 'green'},
-    2: {title: '限价' , color: 'blue' }
-    }[d.tradeType];
-    }}
-    <span class="layui-badge febs-tag-{{tradeType.color}}">{{ tradeType.title }}</span>
-</script>
-<script type="text/html" id="openingType">
-    {{#
-    var openingType = {
-    1: {title: '开多' , color: 'green'},
-    2: {title: '开空' , color: 'red' }
-    }[d.openingType];
-    }}
-    <span class="layui-badge febs-tag-{{openingType.color}}">{{ openingType.title }}</span>
-</script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -92,11 +74,23 @@
                 totalRow: true,
                 cols: [[
                     {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'},
-                    {title: '开仓类型', templet: '#openingType', minWidth: 80,align:'center'},
-                    {title: '交易类型', templet: '#tradeType', minWidth: 80,align:'center'},
+                    {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
+                    {field: 'openingType', title: '开仓类型', 
+                    	templet: function (d) {
+                            if (d.openingType === 1) {
+                                return '<span style="color:green;">开多</span>'
+                            }else {
+                                return '<span style="color:red;">开空</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
+                    {field: 'tradeType', title: '交易类型', 
+                        	templet: function (d) {
+                                if (d.tradeType === 1) {
+                                    return '<span style="color:green;">市价</span>'
+                                }else {
+                                    return '<span style="color:red;">限价</span>'
+                                }
+                            }, minWidth: 100,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
                     {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
                     {field: 'rewardRatio', title: '实时盈亏', 
@@ -111,11 +105,13 @@
                     {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
                     {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
                     {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
+                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
                     {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
                     {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
                     {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
-                    {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
-                    {field: 'forceClosingPrice', 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