From 22a1ada1fefc901e391279e01a251aa3c471e96a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 Jun 2020 17:58:00 +0800
Subject: [PATCH] 20200618   代码提交

---
 src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html |  104 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 61 insertions(+), 43 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 151cf48..a9cb42e 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/contractHoldOrder.html
@@ -8,9 +8,8 @@
                             <div class="layui-col-md10">
                                 <div class="layui-form-item">
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">用户名</label>
                                         <div class="layui-input-inline">
-                                            <input type="text" name="username" autocomplete="off" class="layui-input">
+                                            <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
                                         </div>
                                     </div>
                                 </div>
@@ -22,30 +21,36 @@
                                 <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                     <i class="layui-icon">&#xe79b;</i>
                                 </div>
-                                <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
-                                     shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export">
-                                    <i class="layui-icon">&#xe875;</i>
-                                </div>
                             </div>
                         </div>
                     </form>
-                    <table lay-filter="contractHoldOrderTable" lay-data="{id: 'contractHoldOrderTable'}"></table>
+                    <table lay-filter="userTable" lay-data="{id: 'userTable'}"></table>
                 </div>
             </div>
         </div>
     </div>
 </div>
-<script type="text/html" id="user-option">
-    <span shiro:lacksPermission="user:view,user:update,user:delete">
-        <span class="layui-badge-dot febs-bg-orange"></span> 无权限
-    </span>
-    <a lay-event="detail" shiro:hasPermission="user:view"><i
-            class="layui-icon febs-edit-area febs-green">&#xe7a5;</i></a>
-    <a lay-event="edit" shiro:hasPermission="user:update"><i
-            class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i></a>
-    <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red">&#xe7f9;</i></a>
+<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 () {
         var $ = layui.jquery,
             laydate = layui.laydate,
@@ -59,47 +64,60 @@
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
             sortObject = {field: 'createTime', type: null},
-            tableIns,
-            createTimeFrom,
-            createTimeTo;
+            tableIns;
 
         form.render();
 
+        // 表格初始化
         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});
+        });
 
         function initTable() {
             tableIns = febs.table.init({
                 elem: $view.find('table'),
-                id: 'contractHoldOrderTable',
-                url: ctx + 'contractHoldOrder/getList',
+                id: 'userTable',
+                url: ctx + 'tradeManage/contractHoldOrder',
                 cols: [[
-                    {type: 'checkbox'},
-                    {field: 'memberId', title: 'uId', minWidth: 100},
-                    {field: 'memberId', title: '用户账号', minWidth: 100},
-                    {field: 'symbol', title: '币种', minWidth: 100},
-                    {field: 'tradeType', title: '建仓类型', minWidth: 100},
-                    {field: 'openingPrice', title: '建仓价格', minWidth: 100},
-                    {field: 'symbolCnt', title: '建仓张数', minWidth: 100}
+                    {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: 'symbol', title: '币种', minWidth: 100,align:'center'},
+                    {field: 'symbolCnt', title: '手数', minWidth: 80,align:'center'},
+                    {field: 'rewardRatio', title: '实时盈亏', minWidth: 120,align:'center'},
+                    {field: 'symbolSku', title: '币种规格', minWidth: 120,align:'center'},
+                    {field: 'openingPrice', title: '开仓价', minWidth: 100,align:'center'},
+                    {field: 'openingFeeAmount', title: '开仓手续费', minWidth: 120,align:'center'},
+                    {field: 'bondAmount', 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'}
                 ]]
             });
         }
 
-        /* function getQueryParams() {
-            var createTime = $searchForm.find('input[name="createTime"]').val();
-            if (createTime) {
-                createTimeFrom = createTime.split(' - ')[0];
-                createTimeTo = createTime.split(' - ')[1];
-            }
+        // 获取查询参数
+        function getQueryParams() {
             return {
-                createTimeFrom: createTimeFrom,
-                createTimeTo: createTimeTo,
-                username: $searchForm.find('input[name="username"]').val().trim(),
-                status: $searchForm.find("select[name='status']").val(),
-                sex: $searchForm.find("select[name='sex']").val(),
-                mobile: $searchForm.find("input[name='mobile']").val().trim(),
-                deptId: $searchForm.find("input[name='dept']").val().trim(),
-                invalidate_ie_cache: new Date()
+                account: $searchForm.find('input[name="account"]').val().trim(),
             };
-        } */
+        }
+        
     })
 </script>
\ No newline at end of file

--
Gitblit v1.9.1