From 78fae6519d70f30cae9f943037a9896b67cc05a0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 21 Jul 2020 12:41:16 +0800
Subject: [PATCH] 20200721  代码提交

---
 src/main/resources/templates/febs/views/modules/member/withdrawCoin.html |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 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 e0fdc2f..28a49fd 100644
--- a/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
+++ b/src/main/resources/templates/febs/views/modules/member/withdrawCoin.html
@@ -63,14 +63,12 @@
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
     // 引入组件并初始化
-    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect'], function () {
+    layui.use(['jquery', 'laydate', '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'),
@@ -83,17 +81,9 @@
         // 表格初始化
         initTable();
 
-        // 下拉框选择器
-        treeSelect.render({
-            elem: $view.find('#dept'),
-            type: 'get',
-            data: ctx + 'dept/select/tree',
-            placeholder: '请选择',
-            search: false
-        });
-
         // 初始化表格操作栏各个按钮功能
         table.on('tool(userTable)', function (obj) {
+        	$query.click();
             var data = obj.data,
                 layEvent = obj.event;
             if (layEvent === 'confirm') {
@@ -106,7 +96,13 @@
                 	cancelUsers(data.id);
                 });
             }
+            if (layEvent === 'examine') {
+ 			   febs.modal.open( '个人数据详情', 'modules/member/memberInfoDetail/' + data.id, {
+ 			    	maxmin: true,
+                 });
+             }
         });
+        
         
         function confirmUsers(id) {
             febs.get(ctx + 'member/memberWithdrawCoinConfirm/' + id, null, function () {
@@ -120,7 +116,7 @@
                 $query.click();
             });
         }
-
+        
         // 查询按钮
         $query.on('click', function () {
             var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
@@ -130,7 +126,6 @@
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
-            treeSelect.revokeNode('dept');
             sortObject.type = 'null';
             tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
         });
@@ -144,15 +139,16 @@
                 cols: [[
                     {field: 'phone', title: '手机号码', minWidth: 120,align:'left',totalRowText: '合计'},
                     {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
-                    {field: 'inviteId', title: '邀请码UID',
-                    	templet: function (d) {
-                        	return '<a lay-event="see">'+d.inviteId+'</a>'
-                        }, minWidth: 80,align:'center'},
+                    {field: 'accountType', title: '账号类型',
+                        templet: function(d) {
+                            if (d.accountType === 1) {
+                                return "正常账号";
+                            } else {
+                                return "测试账号";
+                            }
+                        }, minWidth: 200,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') {
@@ -161,6 +157,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) {
@@ -177,8 +178,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'}
                 ]]

--
Gitblit v1.9.1