同步pear admin layui

static/admin/admin/css/admin.css

@@ -70,7 +70,9 @@ body,
 .pear-admin .layui-layout-right .layui-nav-child {
 	border: 1px solid whitesmoke;
 	border-radius: 4px;
-	width: 150px;
+	width: auto;
+	left: auto;
+	right: -23px;
 }
 
 .pear-admin .layui-header {
@@ -119,7 +121,7 @@ body,
 .pear-admin .layui-side {
 	top: 0px;
 	width: 230px;
-	box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
+	box-shadow: 2px 0 6px rgba(0, 21, 41, .20);
 	z-index: 9999;
 }
 
@@ -150,6 +152,26 @@ body,
 	left: 0px;
 }
 
+.pear-admin .layui-footer {
+	position: absolute;
+    display: flex;
+    justify-content: space-between;
+	left: 230px;
+	background: #fff;
+	border-top: 1px solid #F2F2F2;
+	box-shadow: none;
+	-webkit-transition: left .3s;
+	transition: left .3s;
+	overflow: hidden;
+	color: #3c3c3cb3;
+	font-weight: 300;
+	font-size: 13.6px;
+}
+
+.pear-admin .layui-footer.close {
+	display: none;
+}
+
 /** 收缩布局 */
 .pear-mini .layui-side .layui-logo .title {
 	display: none;
@@ -176,6 +198,10 @@ body,
 	width: 60px;
 }
 
+.pear-mini .layui-footer {
+	left: 60px;
+}
+
 .pear-mini .layui-nav-tree .layui-nav-item span {
 	display: none;
 }
@@ -202,7 +228,7 @@ body,
 	display: none;
 }
 
-.pear-collasped-pe {
+.pear-collapsed-pe {
 	display: none;
 	width: 50px;
 	position: absolute;
@@ -217,7 +243,7 @@ body,
 	box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
 }
 
-.pear-collasped-pe a {
+.pear-collapsed-pe a {
 	color: white !important;
 }
 
@@ -235,11 +261,11 @@ body,
 
 /** 新增兼容 */
 @media screen and (max-width:768px) {
-	.collaspe {
+	.collapse {
 		display: none !important;
 	}
 
-	.pear-collasped-pe {
+	.pear-collapsed-pe {
 		display: inline-block !important;
 	}
 
@@ -273,6 +299,10 @@ body,
 		left: 0px;
 	}
 
+	.pear-mini .layui-footer {
+		left: 0px;
+	}
+
 	.pear-mini .layui-logo {
 		width: 0px;
 	}
@@ -463,3 +493,65 @@ body,
 	box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .15);
 	line-height: 30px;
 }
+
+.message .layui-tab-title li:not(:last-child) {
+	border-right: 1px solid #eee;
+}
+
+/* 搜索面板 */
+.menu-search-content .layui-input {
+	padding-left: 30px;
+}
+
+.menu-search-content {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: center;
+}
+
+.menu-search-input-wrapper {
+	width: 100%;
+	padding: 15px 15px;
+}
+
+.menu-search-no-data {
+	display: flex;
+	justify-content: center;
+	width: 100%;
+	height: 122px;
+	align-items: center;
+}
+
+.menu-search-list {
+	width: 100%;
+	padding: 5px 15px;
+}
+
+.menu-search-list li {
+	position: relative;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	flex-wrap: nowrap;
+	height: 50px;
+	margin-bottom: 8px;
+	padding: 0px 10px;
+	color: currentColor;
+	font-size: 14px;
+	border-radius: 4px;
+	box-shadow: 0 1px 3px #d4d9e1;
+	cursor: pointer;
+	background-color: #fff;
+}
+
+.menu-search-list li:hover {
+	background-color: #5FB878;
+	color: white;
+}
+
+.menu-search-list li.this {
+	background-color: #5FB878;
+	color: white;
+}
+
+/* 搜索面板结束 */

static/admin/admin/css/loader.css

@@ -102,4 +102,4 @@
 	50% {
 		transform: scale(1.2, 1);
 	}
-}
+}

static/admin/admin/css/other/login.css

@@ -91,3 +91,9 @@ body {
 	height: 42px;
 	border: #e6e6e6 1px solid;
 }
+
+@media (max-width:768px){
+	body{
+		background-position:center;
+	}
+}

static/admin/admin/data/dataMenu.json

@@ -163,7 +163,7 @@
 				"openType": "_iframe",
 				"href": "view/document/popup.html"
 			}]
-		},{
+		}, {
 			"id": 60331,
 			"title": "高级组件",
 			"icon": "layui-icon layui-icon-console",
@@ -175,7 +175,7 @@
 				"type": 1,
 				"openType": "_iframe",
 				"href": "view/document/tab.html"
-			},{
+			}, {
 				"id": 60132,
 				"title": "数据菜单",
 				"icon": "layui-icon layui-icon-face-cry",

static/admin/admin/data/dataTree2.json

@@ -1,10 +1,37 @@
 {
-"status":{"code":200,"message":"操作成功"},
-"data": [
-  {"id":"001","title": "湖南省","checkArr": "0","parentId": "0"},
-  {"id":"002","title": "湖北省","checkArr": "0","parentId": "0"},
-  {"id":"003","title": "广东省","checkArr": "0","parentId": "0"},
-  {"id":"004","title": "浙江省","checkArr": "0","parentId": "0"},
-  {"id":"005","title": "福建省","checkArr": "0","parentId": "0"}
-]
-}
+	"status": {
+		"code": 200,
+		"message": "操作成功"
+	},
+	"data": [{
+			"id": "001",
+			"title": "湖南省",
+			"checkArr": "0",
+			"parentId": "0"
+		},
+		{
+			"id": "002",
+			"title": "湖北省",
+			"checkArr": "0",
+			"parentId": "0"
+		},
+		{
+			"id": "003",
+			"title": "广东省",
+			"checkArr": "0",
+			"parentId": "0"
+		},
+		{
+			"id": "004",
+			"title": "浙江省",
+			"checkArr": "0",
+			"parentId": "0"
+		},
+		{
+			"id": "005",
+			"title": "福建省",
+			"checkArr": "0",
+			"parentId": "0"
+		}
+	]
+}

static/admin/admin/data/dtree.json

@@ -1,181 +1,181 @@
 {
-  "status": {
-    "code": 200,
-    "message": "操作成功"
-  },
-  "data": [{
-      "id": "001",
-      "title": "湖南省",
-      "parentId": "0",
-      "children": [{
-          "id": "001001",
-          "title": "长沙市",
-          "last": true,
-          "parentId": "001"
-        },
-        {
-          "id": "001002",
-          "title": "株洲市",
-          "last": true,
-          "parentId": "001"
-        },
-        {
-          "id": "001003",
-          "title": "湘潭市",
-          "last": true,
-          "parentId": "001"
-        },
-        {
-          "id": "001004",
-          "title": "衡阳市",
-          "last": true,
-          "parentId": "001"
-        },
-        {
-          "id": "001005",
-          "title": "郴州市",
-          "last": true,
-          "parentId": "001"
-        }
-      ]
-    },
-    {
-      "id": "002",
-      "title": "湖北省",
-      "parentId": "0",
-      "children": [{
-          "id": "002001",
-          "title": "武汉市",
-          "last": true,
-          "parentId": "002"
-        },
-        {
-          "id": "002002",
-          "title": "黄冈市",
-          "last": true,
-          "parentId": "002"
-        },
-        {
-          "id": "002003",
-          "title": "潜江市",
-          "last": true,
-          "parentId": "002"
-        },
-        {
-          "id": "002004",
-          "title": "荆州市",
-          "last": true,
-          "parentId": "002"
-        },
-        {
-          "id": "002005",
-          "title": "襄阳市",
-          "last": true,
-          "parentId": "002"
-        }
-      ]
-    },
-    {
-      "id": "003",
-      "title": "广东省",
-      "parentId": "0",
-      "children": [{
-          "id": "003001",
-          "title": "广州市",
-          "last": false,
-          "parentId": "003",
-          "children": [{
-              "id": "003001001",
-              "title": "天河区",
-              "last": true,
-              "parentId": "003001"
-            },
-            {
-              "id": "003001002",
-              "title": "花都区",
-              "last": true,
-              "parentId": "003001"
-            }
-          ]
-        },
-        {
-          "id": "003002",
-          "title": "深圳市",
-          "last": true,
-          "parentId": "003"
-        },
-        {
-          "id": "003003",
-          "title": "中山市",
-          "last": true,
-          "parentId": "003"
-        },
-        {
-          "id": "003004",
-          "title": "东莞市",
-          "last": true,
-          "parentId": "003"
-        },
-        {
-          "id": "003005",
-          "title": "珠海市",
-          "last": true,
-          "parentId": "003"
-        },
-        {
-          "id": "003006",
-          "title": "韶关市",
-          "last": true,
-          "parentId": "003"
-        }
-      ]
-    },
-    {
-      "id": "004",
-      "title": "浙江省",
-      "parentId": "0",
-      "children": [{
-          "id": "004001",
-          "title": "杭州市",
-          "last": true,
-          "parentId": "004"
-        },
-        {
-          "id": "004002",
-          "title": "温州市",
-          "last": true,
-          "parentId": "004"
-        },
-        {
-          "id": "004003",
-          "title": "绍兴市",
-          "last": true,
-          "parentId": "004"
-        },
-        {
-          "id": "004004",
-          "title": "金华市",
-          "last": true,
-          "parentId": "004"
-        },
-        {
-          "id": "004005",
-          "title": "义乌市",
-          "last": true,
-          "parentId": "004"
-        }
-      ]
-    },
-    {
-      "id": "005",
-      "title": "福建省",
-      "parentId": "0",
-      "children": [{
-        "id": "005001",
-        "title": "厦门市",
-        "last": true,
-        "parentId": "005"
-      }]
-    }
-  ]
-}
+	"status": {
+		"code": 200,
+		"message": "操作成功"
+	},
+	"data": [{
+			"id": "001",
+			"title": "湖南省",
+			"parentId": "0",
+			"children": [{
+					"id": "001001",
+					"title": "长沙市",
+					"last": true,
+					"parentId": "001"
+				},
+				{
+					"id": "001002",
+					"title": "株洲市",
+					"last": true,
+					"parentId": "001"
+				},
+				{
+					"id": "001003",
+					"title": "湘潭市",
+					"last": true,
+					"parentId": "001"
+				},
+				{
+					"id": "001004",
+					"title": "衡阳市",
+					"last": true,
+					"parentId": "001"
+				},
+				{
+					"id": "001005",
+					"title": "郴州市",
+					"last": true,
+					"parentId": "001"
+				}
+			]
+		},
+		{
+			"id": "002",
+			"title": "湖北省",
+			"parentId": "0",
+			"children": [{
+					"id": "002001",
+					"title": "武汉市",
+					"last": true,
+					"parentId": "002"
+				},
+				{
+					"id": "002002",
+					"title": "黄冈市",
+					"last": true,
+					"parentId": "002"
+				},
+				{
+					"id": "002003",
+					"title": "潜江市",
+					"last": true,
+					"parentId": "002"
+				},
+				{
+					"id": "002004",
+					"title": "荆州市",
+					"last": true,
+					"parentId": "002"
+				},
+				{
+					"id": "002005",
+					"title": "襄阳市",
+					"last": true,
+					"parentId": "002"
+				}
+			]
+		},
+		{
+			"id": "003",
+			"title": "广东省",
+			"parentId": "0",
+			"children": [{
+					"id": "003001",
+					"title": "广州市",
+					"last": false,
+					"parentId": "003",
+					"children": [{
+							"id": "003001001",
+							"title": "天河区",
+							"last": true,
+							"parentId": "003001"
+						},
+						{
+							"id": "003001002",
+							"title": "花都区",
+							"last": true,
+							"parentId": "003001"
+						}
+					]
+				},
+				{
+					"id": "003002",
+					"title": "深圳市",
+					"last": true,
+					"parentId": "003"
+				},
+				{
+					"id": "003003",
+					"title": "中山市",
+					"last": true,
+					"parentId": "003"
+				},
+				{
+					"id": "003004",
+					"title": "东莞市",
+					"last": true,
+					"parentId": "003"
+				},
+				{
+					"id": "003005",
+					"title": "珠海市",
+					"last": true,
+					"parentId": "003"
+				},
+				{
+					"id": "003006",
+					"title": "韶关市",
+					"last": true,
+					"parentId": "003"
+				}
+			]
+		},
+		{
+			"id": "004",
+			"title": "浙江省",
+			"parentId": "0",
+			"children": [{
+					"id": "004001",
+					"title": "杭州市",
+					"last": true,
+					"parentId": "004"
+				},
+				{
+					"id": "004002",
+					"title": "温州市",
+					"last": true,
+					"parentId": "004"
+				},
+				{
+					"id": "004003",
+					"title": "绍兴市",
+					"last": true,
+					"parentId": "004"
+				},
+				{
+					"id": "004004",
+					"title": "金华市",
+					"last": true,
+					"parentId": "004"
+				},
+				{
+					"id": "004005",
+					"title": "义乌市",
+					"last": true,
+					"parentId": "004"
+				}
+			]
+		},
+		{
+			"id": "005",
+			"title": "福建省",
+			"parentId": "0",
+			"children": [{
+				"id": "005001",
+				"title": "厦门市",
+				"last": true,
+				"parentId": "005"
+			}]
+		}
+	]
+}

static/admin/admin/data/menu.json

@@ -32,6 +32,13 @@
 			"type": 1,
 			"openType": "_iframe",
 			"href": "view/system/theme.html"
+		}, {
+			"id": 16,
+			"title": "酸爽翻倍",
+			"icon": "layui-icon layui-icon-console",
+			"type": 1,
+			"openType": "_iframe",
+			"href": "view/document/core.html"
 		}]
 	},
 	{
@@ -202,7 +209,7 @@
 					"icon": "layui-icon layui-icon-face-cry",
 					"type": 1,
 					"openType": "_iframe",
-					"href": "view/document/hash.html"
+					"href": "view/document/encrypt.html"
 				},
 				{
 					"id": 2042,
@@ -235,6 +242,27 @@
 					"type": 1,
 					"openType": "_iframe",
 					"href": "view/document/topBar.html"
+				},
+				{
+					"id": 2046,
+					"title": "水印组件",
+					"type": 1,
+					"openType": "_iframe",
+					"href": "view/document/watermark.html"
+				},
+				{
+					"id": 2047,
+					"title": "全屏组件",
+					"type": 1,
+					"openType": "_iframe",
+					"href": "view/document/fullscreen.html"
+				},
+				{
+					"id": 2048,
+					"title": "汽泡组件",
+					"type": 1,
+					"openType": "_iframe",
+					"href": "view/document/popover.html"
 				}
 			]
 		}]

static/admin/admin/data/message.json

@@ -85,43 +85,6 @@
 	{
 		"id": 3,
 		"title": "代办",
-		"children": [{
-			"id": 11,
-			"avatar":"https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png",
-			"title": "你收到了 14 份新周报",
-			"context": "这是消息内容。",
-			"form": "就眠仪式",
-			"time": "刚刚"
-		}, {
-			"id": 12,
-			"avatar":"https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png",
-			"title": "曲妮妮 已通过第三轮面试",
-			"context": "这是消息内容。",
-			"form": "就眠仪式",
-			"time": "刚刚"
-		},
-		{
-			"id": 11,
-			"avatar":"https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png",
-			"title": "可以区分多种通知类型",
-			"context": "这是消息内容。",
-			"form": "就眠仪式",
-			"time": "刚刚"
-		}, {
-			"id": 12,
-			"avatar":"https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
-			"title": "左侧图标用于区分不同的类型",
-			"context": "这是消息内容。",
-			"form": "就眠仪式",
-			"time": "刚刚"
-		},
-		{
-			"id": 11,
-			"avatar":"https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png",
-			"title": "内容不要超过两行字",
-			"context": "这是消息内容。",
-			"form": "就眠仪式",
-			"time": "刚刚"
-		}]
+		"children": []
 	}
 ]

static/admin/admin/data/organization.json

@@ -7,32 +7,32 @@
 		"userCount": 324,
 		"location": "二楼201",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "美工部",
 		"userCount": 98,
 		"location": "二楼101",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "设计部",
 		"userCount": 43,
 		"location": "六楼602",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "销售部",
 		"userCount": 12,
 		"location": "一楼131",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "产品部",
 		"userCount": 128,
 		"location": "四楼401",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "财务部",
 		"userCount": 23,
 		"location": "三楼105",
 		"leader": "皮卡丘"
-	},{
+	}, {
 		"name": "人事部",
 		"userCount": 67,
 		"location": "二楼201",

static/admin/admin/data/table.json

@@ -44,7 +44,7 @@
 		"enable": "1",
 		"login": "1",
 		"roleIds": null
-	},{
+	}, {
 		"userId": "4",
 		"username": "admin",
 		"password": "$2a$10$1K7E1.IYCrsoZVCb6utOo.5jENtfOzhdKWhc49t2lk.UQd7Oam4FG",
@@ -86,7 +86,7 @@
 		"enable": "1",
 		"login": "1",
 		"roleIds": null
-	},{
+	}, {
 		"userId": "7",
 		"username": "admin",
 		"password": "$2a$10$1K7E1.IYCrsoZVCb6utOo.5jENtfOzhdKWhc49t2lk.UQd7Oam4FG",
@@ -129,4 +129,4 @@
 		"login": "1",
 		"roleIds": null
 	}]
-}
+}

static/admin/admin/data/user.json

@@ -44,7 +44,7 @@
 		"enable": "1",
 		"login": "1",
 		"roleIds": null
-	},{
+	}, {
 		"userId": "1",
 		"username": "admin",
 		"password": "$2a$10$1K7E1.IYCrsoZVCb6utOo.5jENtfOzhdKWhc49t2lk.UQd7Oam4FG",
@@ -86,7 +86,7 @@
 		"enable": "1",
 		"login": "1",
 		"roleIds": null
-	},{
+	}, {
 		"userId": "1",
 		"username": "admin",
 		"password": "$2a$10$1K7E1.IYCrsoZVCb6utOo.5jENtfOzhdKWhc49t2lk.UQd7Oam4FG",

static/admin/admin/images/background.svg

@@ -18,15 +18,6 @@
     <animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="35s" type="rotate" from="0 210 530" to="360 210 530" repeatCount="indefinite"/>
   </path>
 
-  <circle cx="1200" cy="600" r="30" stroke="rgb(241, 243, 244)" fill="rgb(241, 243, 244)">
-    <animateMotion path="M 0 0 L -20 40 Z" dur="9s" repeatCount="indefinite"/>
-  </circle>
-
-  <path d="M 100 350 A 40 40 0 1 1 180 350 L 180 430 A 40 40 0 1 1 100 430 Z" stroke="rgb(241, 243, 244)" fill="rgb(241, 243, 244)">
-    <animateMotion path="M 140 390 L 180 360 L 140 390" dur="20s" begin="0s" repeatCount="indefinite"/>
-    <animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="30s" type="rotate" values="0 140 390; -60 140 390; 0 140 390" keyTimes="0 ; 0.5 ; 1" repeatCount="indefinite"/>
-  </path>
-
   <rect x="400" y="600" rx="40" ry="40" width="100" height="100" stroke="rgb(129, 201, 149)" fill="rgb(129, 201, 149)">
     <animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="35s" type="rotate" from="-30 550 750" to="330 550 750" repeatCount="indefinite"/>
   </rect>