xiaoyong931011
2021-03-02 4348e057d9b2894a533ba116e21216610934eef0
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,15 @@
                cols: [[
                    {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},
                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},
                    {field: 'tradeType', title: '交易类型',
                    {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: 'tradeType', title: '交易类型',
                       templet: function (d) {
                            if (d.tradeType === 1) {
                                return '<span style="color:green;">市价</span>'
@@ -98,8 +126,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: '订单类型', 
@@ -177,6 +203,16 @@
                                return ''
                            }
                        }, 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: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},
                    {field: 'symbolSku', title: '币种规格', minWidth: 100,align:'center'},
                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,align:'center'},
@@ -190,6 +226,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(),
            };
        }