diff --git a/css/login.css b/css/login.css
index 8ab7e98..6711ccd 100644
--- a/css/login.css
+++ b/css/login.css
@@ -1,5 +1,5 @@
 body {
-    background: url("../images/bg.png") no-repeat center center fixed ;
+    background: url("../images/bg.png") no-repeat center center fixed;
     background-size: cover;
 }
 
diff --git a/css/sub-page.css b/css/sub-page.css
index 59be6ce..abb638e 100644
--- a/css/sub-page.css
+++ b/css/sub-page.css
@@ -56,7 +56,7 @@
     }
 }
 
-okToolbar{
+okToolbar {
     display: block;
     margin-top: 10px;
     margin-bottom: 10px;
@@ -66,12 +66,12 @@ okToolbar{
     background-color: #f2f2f2;
 }
 
-okToolbar span{
+okToolbar span {
     float: right;
     line-height: 30px;
 }
 
 /*form表单*/
-.ok-form{
-	margin-top: 10px;
+.ok-form {
+    margin-top: 10px;
 }
\ No newline at end of file
diff --git a/data/user.json b/data/user.json
index b9e6f55..7e30e84 100644
--- a/data/user.json
+++ b/data/user.json
@@ -1,116 +1,128 @@
 {
-    "code": 0,
-    "msg": "",
-    "count": 11,
-    "data": [{
-        "id": "001",
-        "username": "zhangsan",
-		"name": "张三",
-        "password": "111111",
-        "status": 0,
-		"role": 0,
-        "email": "zhangsan@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "002",
-        "username": "lisi",
-		"name": "李四",
-        "password": "111111",
-        "status": 0,
-		"role": 0,
-        "email": "lisi@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "003",
-        "username": "wangwu",
-		"name": "王五",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "wangwu@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "004",
-        "username": "zhaoliu",
-		"name": "赵六",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "zhaoliu@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "005",
-        "username": "sunqi",
-		"name": "孙七",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "sunqi@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "006",
-        "username": "zhouba",
-		"name": "周八",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "zhouba@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "007",
-        "username": "wujiu",
-		"name": "吴九",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "wujiu@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "008",
-        "username": "zhengshi",
-		"name": "郑十",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "zhengshi@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "009",
-        "username": "liubei",
-		"name": "刘备",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "liubei@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "010",
-        "username": "zhangfei",
-		"name": "张飞",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "zhangfei@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    },{
-        "id": "011",
-        "username": "guanyu",
-		"name": "关羽",
-        "password": "111111",
-        "status": 1,
-		"role": 1,
-        "email": "guanyu@qq.com",
-		"createTime": "2018-05-06 18:15:28",
-        "logins": 24
-    }]
+  "code": 0,
+  "msg": "",
+  "count": 11,
+  "data": [
+    {
+      "id": "001",
+      "username": "zhangsan",
+      "name": "张三",
+      "password": "111111",
+      "status": 0,
+      "role": 0,
+      "email": "zhangsan@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "002",
+      "username": "lisi",
+      "name": "李四",
+      "password": "111111",
+      "status": 0,
+      "role": 0,
+      "email": "lisi@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "003",
+      "username": "wangwu",
+      "name": "王五",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "wangwu@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "004",
+      "username": "zhaoliu",
+      "name": "赵六",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "zhaoliu@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "005",
+      "username": "sunqi",
+      "name": "孙七",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "sunqi@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "006",
+      "username": "zhouba",
+      "name": "周八",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "zhouba@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "007",
+      "username": "wujiu",
+      "name": "吴九",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "wujiu@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "008",
+      "username": "zhengshi",
+      "name": "郑十",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "zhengshi@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "009",
+      "username": "liubei",
+      "name": "刘备",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "liubei@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "010",
+      "username": "zhangfei",
+      "name": "张飞",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "zhangfei@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    },
+    {
+      "id": "011",
+      "username": "guanyu",
+      "name": "关羽",
+      "password": "111111",
+      "status": 1,
+      "role": 1,
+      "email": "guanyu@qq.com",
+      "createTime": "2018-05-06 18:15:28",
+      "logins": 24
+    }
+  ]
 }