From 7ba7366a8c6ce8019339e433b218386645cb5312 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 17:38:53 +0800
Subject: [PATCH] Merge branch 'piot' of https://gitee.com/chonggaoxiao/new_excoin_manage into piot

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

diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index b99c9db..f340fd7 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -43,22 +43,20 @@
 </div>
 <!-- 表格操作栏 start -->
 <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="edit" shiro:hasPermission="user:update"><i
-            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
+    {{# if(d.certifyStatus == 1) { }}
+        <a lay-event="edit" shiro:hasPermission="member:update"><i class="layui-icon febs-edit-area febs-blue">&#xe7bc;</i></a>
+    {{# } else { }}
+        <a lay-event="see"><i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
+    {{# } }}
 </script>
 <!-- 表格操作栏 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,
-            dropdown = layui.dropdown,
             $view = $('#febs-user'),
             $query = $view.find('#query'),
             $reset = $view.find('#reset'),
@@ -92,17 +90,6 @@
 			    	maxmin: true,
                 });
             }
-            if (layEvent === 'addCoin') {
- 			   febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {
-                   btn: ['提交', '取消'],
-                   yes: function (index, layero) {
-                       $('#user-update').find('#submit').trigger('click');
-                   },
-                   btn2: function () {
-                       layer.closeAll();
-                   }
-               });
-             }
             if (layEvent === 'examine') {
   			   febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {
   			    	maxmin: true,
@@ -129,26 +116,28 @@
                 elem: $view.find('table'),
                 id: 'userTable',
                 url: ctx + 'member/getList',
+                totalRow : true,
                 cols: [[
-                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
-                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
-                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
+                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+                    {field: 'email', title: '邮箱', minWidth: 100,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 50,align:'left'},
                     {field: 'inviteId', title: '邀请码UID',
                     	templet: function (d) {
                                 return '<a lay-event="examine" shiro:hasPermission="user:update">'+d.inviteId+'</a>'
-                            }
-                        }, minWidth: 80,align:'center'},
+                            }, minWidth: 80,align:'center'},
                     {field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
-                    {field: 'accountType', title: '账号类型',
-                    	templet: function (d) {
-                            if (d.accountType === 2) {
-                                return '<span style="color:green;">测试账号</span>'
-                            } else if (d.accountType === 1) {
-                                return '<span style="color:red;">正常账号</span>'
-                            }else{
-                                return ''
-                            }
-                        }, minWidth: 80,align:'center'},
+                    {field: 'usdtAmount', title: 'USDT', minWidth: 80,align:'center', totalRow: true},
+                    {field: 'rfncAmount', title: 'RFNC', minWidth: 80,align:'center', totalRow: true},
+                    // {field: 'accountType', title: '账号类型',
+                    // 	templet: function (d) {
+                    //         if (d.accountType === 2) {
+                    //             return '<span style="color:green;">测试账号</span>'
+                    //         } else if (d.accountType === 1) {
+                    //             return '<span style="color:red;">正常账号</span>'
+                    //         }else{
+                    //             return ''
+                    //         }
+                    //     }, minWidth: 80,align:'center'},
                     {field: 'refererId', title: '账号状态',
                         	templet: function (d) {
                                 if (d.accountStatus === 1) {
@@ -159,6 +148,16 @@
                                     return ''
                                 }
                             }, minWidth: 80,align:'center'},
+                    {field: 'ipo', title: '私募',
+                        templet: function (d) {
+                            if (d.ipo === 1) {
+                                return '<span style="color:red;">是</span>'
+                            } else if (d.ipo === 0) {
+                                return '<span style="color:gray;">否</span>'
+                            }else{
+                                return '<span style="color:gray;">否</span>'
+                            }
+                        }, minWidth: 80,align:'center'},
                     {field: 'refererId', title: '审核状态',
                             	templet: function (d) {
                                     if (d.certifyStatus === 0) {
@@ -174,20 +173,18 @@
                                     }
                                 }, minWidth: 80,align:'center'},
                     {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
-                    {title: '操作', 
-                    	templet: function (d) {
-                            if (d.certifyStatus === 1) {
-                            	return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
-                            	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
-                            	+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
-                            }else if(d.certifyStatus === 2){
-                            	return '<a lay-event="see" shiro:hasPermission="user:update">'
-                            	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'
-                            	+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
-                            }else {
-                                return '<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
-                            }
-                        },minWidth: 200,align:'center'}
+                    {title: '操作',
+                    	// templet: function (d) {
+                        //     if (d.certifyStatus === 1) {
+                        //     	return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
+                        //     	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
+                        //     }else {
+                        //     	return '<a lay-event="see" shiro:hasPermission="user:update">'
+                        //     	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'
+                        //     }
+                        // }
+                        toolbar: '#user-option'
+                        ,minWidth: 200,align:'center'}
                 ]]
             });
         }

--
Gitblit v1.9.1