From 044cb4aa5da2cf5928e3e36e4007a361cd88fb24 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 27 Jul 2020 10:46:56 +0800 Subject: [PATCH] 20200727 代码提交 --- src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html | 81 +++++++++++++++++++++++----------------- 1 files changed, 47 insertions(+), 34 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 7fc3d80..9475656 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,16 @@ <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="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"> @@ -30,35 +40,14 @@ </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="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> <!-- 表格操作栏 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'), @@ -80,8 +69,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() { @@ -89,13 +77,27 @@ elem: $view.find('table'), id: 'userTable', url: ctx + 'tradeManage/contractHoldOrder', + totalRow: true, cols: [[ - {field: 'phone', title: '手机号', minWidth: 100,align:'left'}, - {field: 'email', title: '邮箱', minWidth: 200,align:'left'}, - {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'}, - {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'}, - {title: '开仓类型', templet: '#openingType', minWidth: 80,align:'center'}, - {title: '交易类型', templet: '#tradeType', minWidth: 80,align:'center'}, + {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'}, + {field: 'realName', title: '姓名', minWidth: 120,align:'left'}, + {field: 'forceClosingPrice', title: '预估强平价', minWidth: 120,align:'center'}, + {field: 'openingType', title: '开仓类型', + templet: function (d) { + if (d.openingType === 1) { + return '<span style="color:green;">开多</span>' + }else { + return '<span style="color:red;">开空</span>' + } + }, minWidth: 100,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: 100,align:'center'}, {field: 'symbol', title: '币种', minWidth: 100,align:'center'}, {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'}, {field: 'rewardRatio', title: '实时盈亏', @@ -105,16 +107,26 @@ }else { return '<span style="color:red;">' + d.rewardRatio + '</span>' } - },minWidth: 120,align:'center'}, + },minWidth: 120,align:'center',totalRow: true}, {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'}, {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'}, - {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'}, + {field: 'openingFeeAmount', 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: 'stopLossPrice', title: '止损价', minWidth: 120,align:'center'}, {field: 'stopProfitPrice', title: '止盈价', minWidth: 120,align:'center'}, - {field: 'prePaymentAmount', title: '预付款金额', minWidth: 120,align:'center'}, - {field: 'forceClosingPrice', 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'}, ]] }); } @@ -123,6 +135,7 @@ function getQueryParams() { return { account: $searchForm.find('input[name="account"]').val().trim(), + isTest: $searchForm.find("select[name='isTest']").val(), }; } -- Gitblit v1.9.1