From 7212897a4734aa69e3b2dde1f35502ae47eb9cf3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 16:00:15 +0800
Subject: [PATCH] 20200721  代码提交

---
 src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html b/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html
index 3480cc7..28fbda5 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html
@@ -13,6 +13,16 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">账号类型</label>
+                                        <div class="layui-input-inline">
+                                            <select name="isTest">
+                                                <option value=""></option>
+                                                <option value="1">正常账号</option>
+                     							<option value="2">测试账号</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="layui-inline">
                                         <label class="layui-form-label layui-form-label-sm">平仓类型</label>
                                         <div class="layui-input-inline">
                                             <select name="closingType">
@@ -89,6 +99,7 @@
                 totalRow: true,
                 cols: [[
                     {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
+                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
                     {field: 'tradeType', title: '交易类型', 
                     	templet: function (d) {
@@ -179,6 +190,14 @@
                         }, minWidth: 120,align:'center'},
                     {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
                     {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
+                    {field: 'accountType', title: '账号类型',
+                    	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: 'email', title: '邮箱', minWidth: 200,align:'left'},
                 ]]
             });
@@ -189,6 +208,7 @@
             return {
                 account: $searchForm.find('input[name="account"]').val().trim(),
                 closingType: $searchForm.find("select[name='closingType']").val(),
+                isTest: $searchForm.find("select[name='isTest']").val(),
             };
         }
         

--
Gitblit v1.9.1