diff --git a/package.json b/package.json
index 2f1504c..721fd53 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "canvasScreen-admin",
+ "name": "admin",
"version": "2.6.0",
"description": "canvasScreenAdmin",
"author": "Liu Li",
diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js
new file mode 100644
index 0000000..82f8380
--- /dev/null
+++ b/src/assets/icons/iconfont.js
@@ -0,0 +1 @@
+!function(a){var i,l,t,o,e,n='',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),d=function(a,i){i.parentNode.insertBefore(a,i)};if(h&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){e||(e=!0,t())}function s(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}m()}i=function(){var a,i=document.createElement("div");i.innerHTML=n,n=null,(i=i.getElementsByTagName("svg")[0])&&(i.setAttribute("aria-hidden","true"),i.style.position="absolute",i.style.width=0,i.style.height=0,i.style.overflow="hidden",i=i,(a=document.body).firstChild?d(i,a.firstChild):a.appendChild(i))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),i()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(t=i,o=a.document,e=!1,s(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,m())})}(window);
\ No newline at end of file
diff --git a/src/assets/images/n-zs.png b/src/assets/images/n-zs.png
new file mode 100644
index 0000000..b455ac9
Binary files /dev/null and b/src/assets/images/n-zs.png differ
diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css
index 84b5774..9b01f8c 100644
--- a/src/assets/styles/iconfont.css
+++ b/src/assets/styles/iconfont.css
@@ -12,4 +12,10 @@
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+}
+.font-icon {
+ width: 2em;
+ height: 2em;
+ fill: currentColor;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 70951e2..edc2aad 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -133,7 +133,8 @@ aside {
padding: 20px 24px;
background-color: #fff;
border-radius: 4px;
- min-height: calc(100vh - 152px);
+ // min-height: calc(100vh - 152px);
+ min-height: calc(100vh - 116px);
}
.components-container {
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index edb7e17..97c0612 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -4,6 +4,7 @@
min-height: 100%;
transition: margin-left .28s;
margin-left: $sideBarWidth;
+ // padding-top: 64px;
position: relative;
background-color: #f5f5f5;
.el-button--primary {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5d47ee3..441fb33 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -6,7 +6,7 @@