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/accountInfo.html |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html b/src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html
index 82630cc..6b42996 100644
--- a/src/main/resources/templates/febs/views/modules/trademanage/accountInfo.html
+++ b/src/main/resources/templates/febs/views/modules/trademanage/accountInfo.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">
@@ -33,14 +43,11 @@
 <!-- 表格操作栏 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'),
@@ -62,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() {
@@ -73,15 +79,23 @@
                 url: ctx + 'tradeManage/memberAccountInfo',
                 totalRow: true,
                 cols: [[
-                    {field: 'phone', title: '手机号', minWidth: 100,align:'left',totalRowText: '合计'},
+                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
                     {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
-                    {field: 'walletCoinAvailableBalance', title: '币币可用', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'walletCoinFrozenBalance', title: '币币冻结', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'walletCoinTotalBalance', title: '币币总金额', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'walletAvailableBalance', title: '合约可用', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'walletFrozenBalance', title: '合约冻结', minWidth: 80,align:'center',totalRow: true},
-                    {field: 'walletTotalBalance', title: '合约总金额', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'rewardratioByMid', title: '盈亏',
+                    	templet: function (d) {
+                            if (d.rewardratioByMid > 0) {
+                                return '<span style="color:green;">'+d.rewardratioByMid+'</span>'
+                            } else {
+                                return '<span style="color:red;">'+d.rewardratioByMid+'</span>'
+                            } 
+                        }, minWidth: 80,align:'center',totalRow: true},
+                    {field: 'walletAvailableBalance', title: '币币可用', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'walletFrozenBalance', title: '币币冻结', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'walletCoinAvailableBalance', title: '合约可用', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'walletCoinFrozenBalance', title: '合约冻结', minWidth: 80,align:'center',totalRow: true},
+                    {field: 'walletCoinTotalBalance', title: '合约总金额', minWidth: 80,align:'center',totalRow: true},
                     {field: 'isSuAccount', title: '是否是代理',
                     	templet: function (d) {
                             if (d.isSuAccount === 1) {
@@ -92,6 +106,14 @@
                                 return ''
                             }
                         }, minWidth: 80,align:'center',totalRow: true},
+                        {field: 'accountType', title: '账号类型',
+                        	templet: function (d) {
+                                if (d.accountType === 2) {
+                                    return '<span style="color:red;">测试账号</span>'
+                                } else if (d.accountType === 1) {
+                                    return '<span style="color:green;">正常账号</span>'
+                                }
+                            },minWidth: 100,align:'center'},
                     {field: 'agentAvailableBalance', title: '代理账户', minWidth: 80,align:'center',totalRow: true}
                 ]]
             });
@@ -101,6 +123,7 @@
         function getQueryParams() {
             return {
                 account: $searchForm.find('input[name="account"]').val().trim(),
+                isTest: $searchForm.find("select[name='isTest']").val(),
             };
         }
         

--
Gitblit v1.9.1