@@ -57,7 +54,7 @@
- 
+ 
@@ -163,6 +160,7 @@
peopleInfo:{
managerName:''//账号
},
+ subMenuList:[],//
},
watch:{
menuList:function(n,o){
@@ -174,6 +172,9 @@
parentMenuList:function(n,o){
this.mainParentMenuList = n.slice(0,5);
},
+ menuActive:function(n,o){
+ console.log('激活',n);
+ }
},
methods: {
// 菜单列表
@@ -254,7 +255,6 @@
},
// 打开修改密码，退出的模态框
openModal:function(){
- console.log('event.target',event.target.innerText);
event.target.innerText.indexOf('修改密码')>-1
? resetPasswordVue.isShow=true : exitSystemVue.isShow=true
}
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index 05deaa14..feca8e86 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -8,9 +8,7 @@
-
+
diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
index 15ccbb29..f980a397 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
@@ -308,7 +308,7 @@ textarea::-webkit-input-placeholder {
position: absolute;
right: -34px;
top: 50%;
- z-index: 9999;
+ z-index: 999;
cursor: pointer;
}
.ms-admin-menu-aside .ms-admin-menu .ms-menu-expand i {
diff --git a/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg b/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg
new file mode 100644
index 00000000..edcea88f
Binary files /dev/null and b/src/main/webapp/static/ms-admin/4.7.0/images/default_handsome.jpg differ
diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
index 062f0366..c46c840a 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less
+++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
@@ -183,7 +183,7 @@
position: absolute;
right: -34px;
top: 50%;
- z-index:9999;
+ z-index:999;
cursor: pointer;
// 收缩
i{
+