From 7cc2e1b6c6b1b8f8db88dd24fccd521a217e21c1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 19:43:12 +0800
Subject: [PATCH] modify
---
src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html | 102 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 22 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 d9c2c73..e9b258b 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/historyOrder.html
@@ -28,6 +28,26 @@
</select>
</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="accountType">
+ <option value="0">请选择</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">
@@ -90,7 +110,25 @@
cols: [[
{field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
{field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
- {field: 'tradeType', title: '交易类型',
+ {field: 'realName', title: '真实姓名', minWidth: 120,align:'center'},
+ {field: 'positionType', title: '开仓类型',
+ templet: function (d) {
+ if (d.positionType === 1) {
+ return '<span style="color:green;">分仓</span>'
+ }else {
+ return '<span style="color:red;">全仓</span>'
+ }
+ }, minWidth: 100,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: 'symbol', title: '币种', minWidth: 120,align:'center'},
+ {field: 'tradeType', title: '交易类型',
templet: function (d) {
if (d.tradeType === 1) {
return '<span style="color:green;">市价</span>'
@@ -98,9 +136,6 @@
return '<span style="color:red;">限价</span>'
}
}, minWidth: 100,align:'center'},
-
-
- {field: 'symbol', title: '币种', minWidth: 120,align:'center'},
{field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
{field: 'orderType', title: '订单类型',
templet: function (d) {
@@ -118,6 +153,19 @@
}, minWidth: 100,align:'center'},
{field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
{field: 'openingTime', title: '开仓时间', minWidth: 200,align:'center'},
+ {field: 'bondAmount', title: '保证金', minWidth: 120,align:'center'},
+ {field: 'rewardAmount', title: '盈亏金额',
+ templet: function (d) {
+ if (d.rewardAmount > 0) {
+ return '<span style="color:green;">' + d.rewardAmount + '</span>'
+ }
+ if (d.rewardAmount < 0) {
+ return '<span style="color:red;">' + d.rewardAmount + '</span>'
+ }
+ if (d.rewardAmount == 0 || d.rewardAmount == "" || d.rewardAmount == null) {
+ return '<span></span>'
+ }
+ },minWidth: 120,align:'center',totalRow: true},
{field: 'closingType', title: '平仓类型',
templet: function (d) {
if (d.closingType === 0) {
@@ -144,27 +192,35 @@
}, minWidth: 120,align:'center'},
{field: 'closingPrice', title: '平仓价', minWidth: 100,align:'center'},
{field: 'closingTime', title: '平仓时间', minWidth: 200,align:'center'},
- {field: 'rewardAmount', title: '盈亏金额',
- templet: function (d) {
- if (d.rewardAmount > 0) {
- return '<span style="color:green;">' + d.rewardAmount + '</span>'
- }
- if (d.rewardAmount < 0) {
- return '<span style="color:red;">' + d.rewardAmount + '</span>'
- }
- if (d.rewardAmount == 0 || d.rewardAmount == "" || d.rewardAmount == null) {
- return '<span></span>'
- }
- },minWidth: 120,align:'center',totalRow: true},
- {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: 'rewardRatio', title: '盈亏比例',
+ templet: function (d) {
+ if (d.rewardRatio > 0) {
+ return '<span style="color:green;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+ }
+ if (d.rewardRatio < 0) {
+ return '<span style="color:red;">' + parseFloat((d.rewardRatio*100).toFixed(2))+'%' + '</span>'
+ }
+ if (d.rewardRatio == 0 || d.rewardRatio == "" || d.rewardRatio == null) {
+ return '<span></span>'
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'accountType', title: '账号类型',
+ templet: function (d) {
+ if (d.accountType === 1) {
+ return '<span style="color:green;">正常账号</span>'
+ }else if (d.accountType === 2) {
+ return '<span style="color:red;">测试账号</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 120,align:'center'},
+ {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'},
+ {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'},
+ {field: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'},
+ {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'},
{field: 'holdAmount', title: '持仓费', minWidth: 120,align:'center',totalRow: true},
- {field: 'rewardRatio', title: '盈亏比例', minWidth: 120,align:'center'},
{field: 'entrustOpeningPrice', title: '委托开仓价', minWidth: 150,align:'center'},
{field: 'entrustTime', title: '委托时间', minWidth: 200,align:'center'},
{field: 'orderStatus', title: '订单状态',
@@ -190,6 +246,8 @@
return {
account: $searchForm.find('input[name="account"]').val().trim(),
closingType: $searchForm.find("select[name='closingType']").val(),
+ contractType: $searchForm.find("select[name='contractType']").val(),
+ accountType: $searchForm.find("select[name='accountType']").val(),
};
}
--
Gitblit v1.9.1