20200724 代码提交

xiaoyong931011

2020-07-24 1dd3c53ff3383a89635cf322a2308ca61139e082

 src/main/resources/templates/febs/views/modules/trademanage/historyOrderAlone.html

@@ -13,6 +13,16 @@
                                        </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 class="layui-inline">

                                        <label class="layui-form-label layui-form-label-sm">平仓类型</label>

                                        <div class="layui-input-inline">

                                            <select name="closingType">

@@ -89,6 +99,7 @@
                totalRow: true,

                cols: [[

                    {field: 'phone', title: '手机号', minWidth: 120,align:'left',totalRowText: '合计'},

                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},

                    {field: 'inviteId', title: '邀请码UID', minWidth: 120,align:'center'},

                    {field: 'tradeType', title: '交易类型', 

                       templet: function (d) {

@@ -179,6 +190,14 @@
                        }, minWidth: 120,align:'center'},

                    {field: 'orderNo', title: '订单编号', minWidth: 200,align:'center'},

                    {field: 'leverRatio', title: '杠杆倍率', minWidth: 120,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'},

                ]]

            });

@@ -189,6 +208,7 @@
            return {

                account: $searchForm.find('input[name="account"]').val().trim(),

                closingType: $searchForm.find("select[name='closingType']").val(),

                isTest: $searchForm.find("select[name='isTest']").val(),

            };

        }