From 2d57b956efa9227c602ab6598bfa8958fcea3e34 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Jun 2020 18:00:01 +0800
Subject: [PATCH] 20200630   代码提交

---
 src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html |  123 ++++++++++++++++++----------------------
 1 files changed, 56 insertions(+), 67 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 d33ddb1..f2052ac 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -30,69 +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="closingType">
-    {{#
-    var closingType = {
-    0: {title: '开仓' , color: 'blue'},
-    2: {title: '平多' , color: 'green'},
-    3: {title: '平空' , color: 'red'},
-    4: {title: '爆仓平多' , color: 'red'},
-    5: {title: '爆仓平空' , color: 'red'},
-    6: {title: '止盈平多' , color: 'green'},
-    7: {title: '止盈平空' , color: 'green'},
-    8: {title: '止损平多' , color: 'red'},
-    9: {title: '止损平空' , color: 'red'}
-    }[d.closingType];
-    }}
-    <span class="layui-badge febs-tag-{{closingType.color}}">{{ closingType.title }}</span>
-</script>
-<script type="text/html" id="orderStatus">
-    {{#
-    var orderStatus = {
-    1: {title: '成交' , color: 'green'},
-    2: {title: '撤单' , color: 'blue' }
-    }[d.orderStatus];
-    }}
-    <span class="layui-badge febs-tag-{{orderStatus.color}}">{{ orderStatus.title }}</span>
-</script>
-<script type="text/html" id="orderType">
-    {{#
-    var orderType = {
-    1: {title: '开多' , color: 'green'},
-    2: {title: '开空' , color: 'red'},
-    3: {title: '平多' , color: 'green'},
-    4: {title: '平空' , color: 'red' }
-    }[d.orderType];
-    }}
-    <span class="layui-badge febs-tag-{{orderType.color}}">{{ orderType.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>
-<script type="text/html" id="isCanClosing">
-    {{#
-    var openingType = {
-    1: {title: '是' , color: 'green'},
-    0: {title: '否' , color: 'red' }
-    }[d.isCanClosing];
-    }}
-    <span class="layui-badge febs-tag-{{isCanClosing.color}}">{{ isCanClosing.title }}</span>
-</script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
@@ -140,10 +77,62 @@
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
-                    {title: '交易类型', templet: '#tradeType', minWidth: 120,align:'center'},
-                    {title: '订单类型', templet: '#orderType', minWidth: 120,align:'center'},
-                    {title: '订单状态', templet: '#orderStatus', minWidth: 120,align:'center'},
-                    {title: '平仓类型', templet: '#closingType', minWidth: 120,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: 120,align:'center'},
+                    {field: 'orderType', title: '订单类型', 
+                    	templet: function (d) {
+                            if (d.orderType === 1) {
+                                return '<span style="color:green;">开多</span>'
+                            }else if (d.orderType === 2) {
+                                return '<span style="color:red;">开空</span>'
+                            }else if (d.orderType === 3) {
+                                return '<span style="color:green;">平多</span>'
+                            }else if (d.orderType === 4) {
+                                return '<span style="color:red;">平空</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 120,align:'center'},
+                    {field: 'orderStatus', title: '订单状态', 
+                    	templet: function (d) {
+                            if (d.orderStatus === 1) {
+                                return '<span style="color:green;">成交</span>'
+                            }else if (d.orderStatus === 2) {
+                                return '<span style="color:red;">撤单</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 120,align:'center'},
+                    {field: 'closingType', title: '平仓类型', 
+                    	templet: function (d) {
+                            if (d.closingType === 0) {
+                                return '<span style="color:blue;">开仓</span>'
+                            }else if (d.closingType === 2) {
+                                return '<span style="color:green;">平多</span>'
+                            }else if (d.closingType === 3) {
+                                return '<span style="color:red;">平空</span>'
+                            }else if (d.closingType === 4) {
+                                return '<span style="color:red;">爆仓平多</span>'
+                            }else if (d.closingType === 5) {
+                                return '<span style="color:red;">爆仓平空</span>'
+                            }else if (d.closingType === 6) {
+                                return '<span style="color:green;">止盈平多</span>'
+                            }else if (d.closingType === 7) {
+                                return '<span style="color:green;">止盈平空</span>'
+                            }else if (d.closingType === 8) {
+                                return '<span style="color:red;">止损平多</span>'
+                            }else if (d.closingType === 9) {
+                                return '<span style="color:red;">止损平空</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 120,align:'center'},
                     {field: 'rewardAmount', title: '盈亏金额', 
                     	templet: function (d) {
                             if (d.rewardAmount > 0) {

--
Gitblit v1.9.1