diff --git a/admin/data/menu.json b/admin/data/menu.json
index d82e6c8..176a770 100644
--- a/admin/data/menu.json
+++ b/admin/data/menu.json
@@ -45,7 +45,8 @@
"title": "基础组件",
"icon": "layui-icon layui-icon-console",
"type": 0,
- "children": [{
+ "children": [
+ {
"id": 2011,
"title": "功能按钮",
"icon": "layui-icon layui-icon-face-smile",
diff --git a/admin/data/table.json b/admin/data/table.json
index 8b14b32..b8aef45 100644
--- a/admin/data/table.json
+++ b/admin/data/table.json
@@ -8,8 +8,8 @@
"password": "$2a$10$1K7E1.IYCrsoZVCb6utOo.5jENtfOzhdKWhc49t2lk.UQd7Oam4FG",
"salt": null,
"status": null,
- "realName": "超级管理员",
- "email": "8540854@qq.com",
+ "realName": "超级'管'理员",
+ "email": "854085'4@'qq.com",
"avatar": null,
"sex": "1",
"phone": "15543526531",
@@ -22,7 +22,7 @@
"password": null,
"salt": null,
"status": null,
- "realName": "就眠仪式",
+ "realName": "就\"眠\"仪式",
"email": null,
"avatar": null,
"sex": "1",
diff --git a/component/pear/css/module/layout.css b/component/pear/css/module/layout.css
index d9cc424..beceeea 100644
--- a/component/pear/css/module/layout.css
+++ b/component/pear/css/module/layout.css
@@ -205,101 +205,105 @@ body::-webkit-scrollbar-corner {
width: 100%;
}
-.pear-col-md-offset1 {
- margin-left: 4.16%;
+@media all and (min-width:993px) and (max-width:1199px) {
+
+ .pear-col-md-offset1 {
+ margin-left: 4.16%;
+ }
+
+ .pear-col-md-offset2 {
+ margin-left: 8.33%;
+ }
+
+ .pear-col-md-offset3 {
+ margin-left: 12.5%;
+ }
+
+ .pear-col-md-offset4 {
+ margin-left: 16.66%;
+ }
+
+ .pear-col-md-offset5 {
+ margin-left: 20.83%;
+ }
+
+ .pear-col-md-offset6 {
+ margin-left: 25%;
+ }
+
+ .pear-col-md-offset7 {
+ margin-left: 29.16%;
+ }
+
+ .pear-col-md-offset8 {
+ margin-left: 33.33%;
+ }
+
+ .pear-col-md-offset9 {
+ margin-left: 37.5%;
+ }
+
+ .pear-col-md-offset10 {
+ margin-left: 41.66%;
+ }
+
+ .pear-col-md-offset11 {
+ margin-left: 45.83%;
+ }
+
+ .pear-col-md-offset12 {
+ margin-left: 50%;
+ }
+
+ .pear-col-md-offset13 {
+ margin-left: 54.16%;
+ }
+
+ .pear-col-md-offset14 {
+ margin-left: 58.33%;
+ }
+
+ .pear-col-md-offset15 {
+ margin-left: 62.5%;
+ }
+
+ .pear-col-md-offset16 {
+ margin-left: 66.66%;
+ }
+
+ .pear-col-md-offset17 {
+ margin-left: 70.83%;
+ }
+
+ .pear-col-md-offset18 {
+ margin-left: 75%;
+ }
+
+ .pear-col-md-offset19 {
+ margin-left: 79.16%;
+ }
+
+ .pear-col-md-offset20 {
+ margin-left: 83.33%;
+ }
+
+ .pear-col-md-offset21 {
+ margin-left: 87.5%;
+ }
+
+ .pear-col-md-offset22 {
+ margin-left: 91.66%;
+ }
+
+ .pear-col-md-offset23 {
+ margin-left: 95.83%;
+ }
+
+ .pear-col-md-offset24 {
+ margin-left: 100%;
+ }
}
-.pear-col-md-offset2 {
- margin-left: 8.33%;
-}
-
-.pear-col-md-offset3 {
- margin-left: 12.5%;
-}
-
-.pear-col-md-offset4 {
- margin-left: 16.66%;
-}
-
-.pear-col-md-offset5 {
- margin-left: 20.83%;
-}
-
-.pear-col-md-offset6 {
- margin-left: 25%;
-}
-
-.pear-col-md-offset7 {
- margin-left: 29.16%;
-}
-
-.pear-col-md-offset8 {
- margin-left: 33.33%;
-}
-
-.pear-col-md-offset9 {
- margin-left: 37.5%;
-}
-
-.pear-col-md-offset10 {
- margin-left: 41.66%;
-}
-
-.pear-col-md-offset11 {
- margin-left: 45.83%;
-}
-
-.pear-col-md-offset12 {
- margin-left: 50%;
-}
-
-.pear-col-md-offset13 {
- margin-left: 54.16%;
-}
-
-.pear-col-md-offset14 {
- margin-left: 58.33%;
-}
-
-.pear-col-md-offset15 {
- margin-left: 62.5%;
-}
-
-.pear-col-md-offset16 {
- margin-left: 66.66%;
-}
-
-.pear-col-md-offset17 {
- margin-left: 70.83%;
-}
-
-.pear-col-md-offset18 {
- margin-left: 75%;
-}
-
-.pear-col-md-offset19 {
- margin-left: 79.16%;
-}
-
-.pear-col-md-offset20 {
- margin-left: 83.33%;
-}
-
-.pear-col-md-offset21 {
- margin-left: 87.5%;
-}
-
-.pear-col-md-offset22 {
- margin-left: 91.66%;
-}
-
-.pear-col-md-offset23 {
- margin-left: 95.83%;
-}
-
-.pear-col-md-offset24 {
- margin-left: 100%;
-}
@media all and (max-width:768px) {
.pear-col-xs1 {
diff --git a/view/document/table.html b/view/document/table.html
index c862804..812adba 100644
--- a/view/document/table.html
+++ b/view/document/table.html
@@ -145,7 +145,8 @@
title: '操作',
toolbar: '#user-bar',
align: 'left',
- width: 160
+ width: 160,
+ fixed: 'right'
}
]
]
diff --git a/view/result/error.html b/view/result/error.html
index 5a9e613..6ea37a1 100644
--- a/view/result/error.html
+++ b/view/result/error.html
@@ -32,5 +32,14 @@
+