From f91bfc50f9e933c4fb66e092f738cfc22eb87bb0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 23 Mar 2021 14:38:14 +0800
Subject: [PATCH] 20210323  后台保留两位小数,(平台数据除外)

---
 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 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 d9e7b67..9d9478e 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -12,6 +12,26 @@
                                             <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
+                                    <div class="layui-inline">
+                                        <label class="layui-form-label layui-form-label-sm">合约类型</label>
+                                        <div class="layui-input-inline">
+                                            <select name="contractType">
+                                                <option value="0">请选择</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="isTest">
+                                                <option value=""></option>
+                                                <option value="1">正常账号</option>
+                     							<option value="2">测试账号</option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -33,14 +53,11 @@
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
-    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+    layui.use(['jquery', 'form', 'table', 'febs'], function () {
         var $ = layui.jquery,
-            laydate = layui.laydate,
             febs = layui.febs,
             form = layui.form,
             table = layui.table,
-            treeSelect = layui.treeSelect,
-            dropdown = layui.dropdown,
             $view = $('#febs-user'),
             $query = $view.find('#query'),
             $reset = $view.find('#reset'),
@@ -62,8 +79,7 @@
         // 刷新按钮
         $reset.on('click', function () {
         	$searchForm[0].reset();
-            sortObject.type = 'null';
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: getQueryParams(), page: {curr: 1}});
         });
 
         function initTable() {
@@ -74,6 +90,17 @@
                 totalRow: true,
                 cols: [[
                     {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
+                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
+                    {field: 'inviteIdTrader', title: '交易员邀请码', minWidth: 120,align:'left'},
+                    {field: 'createTime', title: '时间', minWidth: 120,align:'center'},
+                    {field: 'contractType', title: '合约类型',
+                        templet: function (d) {
+                            if (d.contractType === 1) {
+                                return '<span style="color:green;">普通合约</span>'
+                            }else {
+                                return '<span style="color:red;">跟单合约</span>'
+                            }
+                        }, minWidth: 100,align:'center'},
                     {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
                     {field: 'openingType', title: '开仓类型', 
                     	templet: function (d) {
@@ -93,6 +120,7 @@
                             }, minWidth: 100,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
                     {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+                    {field: 'symbolCntSale', title: '可平张数', minWidth: 120,align:'center'},
                     {field: 'rewardRatio', title: '实时盈亏', 
                     	templet: function (d) {
                             if (d.rewardRatio > 0) {
@@ -101,16 +129,25 @@
                                 return '<span style="color:red;">' + d.rewardRatio + '</span>'
                             }
                         },minWidth: 120,align:'center',totalRow: true},
-                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
+                    {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: 'leverRatio', 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) {
+                            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'},
                 ]]
             });
@@ -120,6 +157,9 @@
         function getQueryParams() {
             return {
                 account: $searchForm.find('input[name="account"]').val().trim(),
+                isTest: $searchForm.find("select[name='isTest']").val(),
+                contractType: $searchForm.find("select[name='contractType']").val(),
+                accountType: $searchForm.find("select[name='accountType']").val(),
             };
         }
         

--
Gitblit v1.9.1