From eb7ddd9fa30be957ef5da23bf7e0316cbb6039b8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 19 Aug 2020 11:18:14 +0800
Subject: [PATCH] 20200819

---
 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html |   45 +++++++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
index 72e7f57..1f5adcf 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -24,6 +24,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="isInsideOption">
@@ -96,10 +106,11 @@
                 	cancelUsers(data.id);
                 });
             }
-            if (layEvent === 'see') {
-            	console.log(obj)
-                febs.view.tab.change(ctx + "modules/member/memberDataInfoLists/" + data.id);
-            }
+            if (layEvent === 'examine') {
+ 			   febs.modal.open( '个人数据详情', 'modules/member/memberInfoDetail/' + data.id, {
+ 			    	maxmin: true,
+                 });
+             }
         });
         
         
@@ -125,9 +136,7 @@
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
-            treeSelect.revokeNode('dept');
-            sortObject.type = 'null';
-            tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
+            tableIns.reload({where: getQueryParams(), page: {curr: 1}});
         });
 
         function initTable() {
@@ -138,13 +147,18 @@
                 totalRow: true,
                 cols: [[
                     {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
+                    {field: 'realName', title: '姓名', minWidth: 120,align:'left'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+                    {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: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
                     {field: 'symbol', title: '币种', minWidth: 100,align:'center'},
-                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
-                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},
-                    {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},
-                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},
                     {field: 'isInside', title: '内部转账',
                     	templet: function (d) {
                             if (d.isInside === 'Y') {
@@ -153,6 +167,11 @@
                                 return '<span style="color:green;">否</span>'
                             }
                         },minWidth: 100,align:'center'},
+                    {field: 'amount', title: '提币数量', minWidth: 120,align:'center' ,totalRow: true},
+                    {field: 'realAmount', title: '到账金额', minWidth: 120,align:'center' ,totalRow: true},
+                    {field: 'address', title: '提币地址', minWidth: 300,align:'center'},
+                    {field: 'feeAmount', title: '提币手续费', minWidth: 100,align:'center', totalRow: true},
+                    {field: 'createTime', title: '提币时间', minWidth: 180,align:'center'},
                     {field: 'status', title: '状态',
                     	templet: function (d) {
                             if (d.status === 1) {
@@ -169,8 +188,9 @@
                             	return '<a lay-event="confirm" shiro:hasPermission="user:delete">确认</a>'
                             	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
                             	+'<a lay-event="cancel" shiro:hasPermission="user:delete">拒绝</a>'
+                            	+'<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'
                             }else {
-                                return ''
+                                return '<a lay-event="examine" shiro:hasPermission="user:delete">查看</a>'
                             }
                         },minWidth: 200,align:'center'}
                 ]]
@@ -182,6 +202,7 @@
             return {
             	account: $searchForm.find('input[name="account"]').val().trim(),
             	status: $searchForm.find("select[name='statusOption']").val(),
+            	isTest: $searchForm.find("select[name='isTest']").val(),
             	isInside: $searchForm.find("select[name='isInsideOption']").val()
             };
         }

--
Gitblit v1.9.1