From 93a3cbccc6c7ac8a2bb4ea8a514c9991993ae950 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 08 Jul 2020 17:43:25 +0800
Subject: [PATCH] 20200708 代码提交
---
src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 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 f2052ac..bb9979b 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -12,6 +12,22 @@
<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="closingType">
+ <option value="0">请选择</option>
+ <option value="2">平多</option>
+ <option value="3">平空</option>
+ <option value="4">爆仓平多</option>
+ <option value="5">爆仓平空</option>
+ <option value="6">止盈平多</option>
+ <option value="7">止盈平空</option>
+ <option value="8">止损平多</option>
+ <option value="9">止损平空</option>
+ </select>
+ </div>
+ </div>
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -52,18 +68,17 @@
// 表格初始化
initTable();
-
+
// 查询按钮
$query.on('click', function () {
var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
tableIns.reload({where: params, page: {curr: 1}});
});
- // 刷新按钮
+ // 刷新按钮
$reset.on('click', function () {
- $searchForm[0].reset();
- sortObject.type = 'null';
- tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+ $searchForm[0].reset();
+ tableIns.reload({where: getQueryParams(), page: {curr: 1}});
});
function initTable() {
@@ -73,10 +88,8 @@
url: ctx + 'tradeManage/historyOrderInfo',
totalRow: true,
cols: [[
- {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
- {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+ {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
- {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
{field: 'tradeType', title: '交易类型',
templet: function (d) {
if (d.tradeType === 1) {
@@ -85,6 +98,10 @@
return '<span style="color:red;">限价</span>'
}
}, minWidth: 120,align:'center'},
+
+
+ {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
+ {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
{field: 'orderType', title: '订单类型',
templet: function (d) {
if (d.orderType === 1) {
@@ -99,16 +116,7 @@
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: 'openingPrice', title: '开仓价', minWidth: 150,align:'center'},
{field: 'closingType', title: '平仓类型',
templet: function (d) {
if (d.closingType === 0) {
@@ -133,6 +141,7 @@
return ''
}
}, minWidth: 120,align:'center'},
+ {field: 'closingPrice', title: '平仓价', minWidth: 150,align:'center'},
{field: 'rewardAmount', title: '盈亏金额',
templet: function (d) {
if (d.rewardAmount > 0) {
@@ -145,33 +154,33 @@
return '<span></span>'
}
},minWidth: 120,align:'center',totalRow: true},
- {field: 'openingPrice', title: '开仓价',
- templet: function (d) {
- if (d.closingPrice > 0 || d.closingPrice < 0) {
- return '<span></span>'
- }else{
- return '<span>' + d.openingPrice + '</span>'
- }
- }, minWidth: 150,align:'center'},
- {field: 'closingPrice', title: '平仓价', minWidth: 150,align:'center'},
+ {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
+ {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
+ {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
+ {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+ {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
+ {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
+ {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
+ {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
{field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
{field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
{field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
-
- {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
- {field: 'symbolCnt', title: '手数', minWidth: 80,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: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
{field: 'symbolSku', title: '币种规格', minWidth: 100,align:'center'},
{field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
- {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
- {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
- {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
- {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
- {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
- {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
- {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center',totalRow: true},
- {field: 'closingFeeAmount', title: '平仓手续费', minWidth: 100,align:'center',totalRow: true},
- {field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true}
+ {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
]]
});
}
@@ -180,6 +189,7 @@
function getQueryParams() {
return {
account: $searchForm.find('input[name="account"]').val().trim(),
+ closingType: $searchForm.find("select[name='closingType']").val(),
};
}
--
Gitblit v1.9.1