From 02008e5173e86f3930b0cd4de8ead64c042acc02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=B4=AA=E9=BE=99?= <599179587@qq.com>
Date: Thu, 27 Jul 2017 20:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ifish/controller/User.java |  4 +-
 src/main/webapp/WEB-INF/views/user/list.jsp  | 90 ++++++++++++++++++--
 2 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/ifish/controller/User.java b/src/main/java/com/ifish/controller/User.java
index 076dfa2..091af07 100644
--- a/src/main/java/com/ifish/controller/User.java
+++ b/src/main/java/com/ifish/controller/User.java
@@ -35,8 +35,8 @@ public class User {
                 + "    <script src=\"static/assets/plugins/forms/tags/jquery.tagsinput.min.js\"></script>\n"
                 + "    <script src=\"static/assets/plugins/forms/tinymce/tinymce.min.js\"></script>\n"
                 + "    <script src=\"static/assets/plugins/tables/jquery.dataTables.js\"></script>\n"
-                + "    <link href=\"static/assets/plugins/tables/jquery.dataTables.css\" type='text/css'/>\n"
-                + "    <link href=\"static/assets/plugins/tables/dataTables.bootstrap.css\" type='text/css'/>\n"
+                + "<link href=\"static/assets/plugins/tables/jquery.dataTables.css\" rel=\"stylesheet\">"
+                + "<link href=\"static/assets/plugins/tables/dataTables.bootstrap.css\" rel=\"stylesheet\">"
                 + "    <script src=\"static/assets/plugins/tables/dataTables.bootstrap.js\"></script>\n"
                 + "    <script src=\"static/assets/plugins/misc/highlight/highlight.pack.js\"></script>\n"
                 + "    <script src=\"static/assets/plugins/misc/countTo/jquery.countTo.js\"></script>\n"
diff --git a/src/main/webapp/WEB-INF/views/user/list.jsp b/src/main/webapp/WEB-INF/views/user/list.jsp
index 1a6e60b..637655d 100644
--- a/src/main/webapp/WEB-INF/views/user/list.jsp
+++ b/src/main/webapp/WEB-INF/views/user/list.jsp
@@ -18,7 +18,7 @@
                     <h4 class="panel-title">Data table</h4>
                 </div>
                 <div class="panel-body">
-                    <table class="table display" id="datatable">
+                    <table class="dataTable cell-border" id="datatable" >
                         <thead>
                             <tr>
                                 <th>ID</th>
@@ -36,6 +36,7 @@
 
                     </table>
                 </div>
+                <button id="prompt-modal" type="button" class="btn btn-success btn-alt mr15 mb15">Prompt modal</button>
             </div>
             <!-- End .panel -->
         </div>
@@ -47,6 +48,18 @@
 
 <script>
     $(document).ready(function () {
+        $('#prompt-modal').click(function () {
+            bootbox.dialog({ message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>' })
+            bootbox.prompt({
+                input:'textarea',
+                title: "请输入要修改的备注",
+                callback: function (result) {
+                    //callback result
+                    console.log(result);
+                }
+            });
+        });
+
         var data = [
             [
                 "Tiger Nixon",
@@ -66,6 +79,8 @@
             ]
         ];
         $('#datatable').DataTable({
+            //记录用户状态
+            stateSave: true,
             //中文自定义
             language: {
                 "sProcessing": "处理中...",
@@ -134,19 +149,76 @@
                     render: function (data, type, row, meta) {
                         var str = "";
                         if (row.createTime != null) {
-                            str = str + "<span class='label label-default mr10 mb10'>" + row.createTime + "</span></br>";
+                            str = str + "<span class='btn btn-dark btn-alt'>" + row.createTime + "</span></br>";
                         }
-                        if (row.phone_type != null) {
-                            str = str + "<span class='label label-info mr10 mb10'>" + row.phone_type + "</span></br>";
+                        if (row.phoneType != null) {
+                            str = str + "<span class='label label-info mr10 mb10'>" + row.phoneType + "</span></br>";
+                        } else if ((row.phoneType == null || row.phoneType == '') && (row.loginType != null && row.loginType != '')) {
+                            str = str + "<span class='label label-info mr10 mb10'>" + row.loginType + "</span></br>";
+                        }
+                        return str;
+                    }
+                },
+                {
+                    "data": "userId",
+                    render: function (data, type, row, meta) {
+                        var str = "";
+                        if (row.loginTime != null) {
+                            str = str + "<span class='btn btn-dark btn-alt'>" + row.loginTime + "</span></br>";
+                        }
+                        if (row.loginType != null) {
+                            str = str + "<span class='label label-info mr10 mb10'>" + row.loginType + "</span>";
+                        }
+                        if (row.loginCount != null) {
+                            str = str + "<span class='label label-info mr10 mb10'>" + row.loginCount + "</span>";
+                        }
+                        return str;
+                    }
+                },
+                {
+                    "data": "userId",
+                    render: function (data, type, row, meta) {
+                        var str = "";
+                        if (row.address != null) {
+                            str = str + "<span class='btn btn-dark btn-alt'>" + row.address + "</span></br>";
+                        }
+                        return str;
+                    }
+                },
+                {
+                    "data": "userId",
+                    render: function (data, type, row, meta) {
+                        var str = "";
+                        if (row.isRegisterGwell != null && row.isRegisterGwell == '1') {
+                            str = "<span class='btn btn-dark btn-alt'>是</span></br>";
+                        } else {
+                            str = "<span class='btn btn-dark btn-alt'>否</span></br>";
+                        }
+                        return str;
+                    }
+                },
+                {
+                    "data": "userId",
+                    render: function (data, type, row, meta) {
+                        var str = "";
+                        if (row.jiguangUserid != null && row.jiguangUserid == '') {
+                            str = "<span class='btn btn-dark btn-alt'>是</span></br>";
+                        } else {
+                            str = "<span class='btn btn-dark btn-alt'>否</span></br>";
+                        }
+                        return str;
+                    }
+                },
+                {
+                    "data": "userId",
+                    render: function (data, type, row, meta) {
+                        var str = "";
+                        if (row.remarks != null) {
+                            str = str + "<span class='btn btn-dark btn-alt'>" + row.remarks + "</span></br>";
                         }
                         return str;
                     }
                 },
-                {"data": "userId"},
-                {"data": "userId"},
-                {"data": "userId"},
-                {"data": "userId"},
-                {"data": "userId"},
                 {"data": "userId"},
                 {"data": "userId"}
             ]