dct 8 kuukautta sitten
vanhempi
commit
0bd8bc6612

+ 539 - 0
public/assets/font/demo.css

@@ -0,0 +1,539 @@
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时,垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}

+ 740 - 0
public/assets/font/demo_index.html

@@ -0,0 +1,740 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>iconfont Demo</title>
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
+  <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
+  <link rel="stylesheet" href="demo.css">
+  <link rel="stylesheet" href="iconfont.css">
+  <script src="iconfont.js"></script>
+  <!-- jQuery -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
+  <!-- 代码高亮 -->
+  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
+  <style>
+    .main .logo {
+      margin-top: 0;
+      height: auto;
+    }
+
+    .main .logo a {
+      display: flex;
+      align-items: center;
+    }
+
+    .main .logo .sub-title {
+      margin-left: 0.5em;
+      font-size: 22px;
+      color: #fff;
+      background: linear-gradient(-45deg, #3967FF, #B500FE);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+  </style>
+</head>
+<body>
+  <div class="main">
+    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
+      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
+      
+    </a></h1>
+    <div class="nav-tabs">
+      <ul id="tabs" class="dib-box">
+        <li class="dib active"><span>Unicode</span></li>
+        <li class="dib"><span>Font class</span></li>
+        <li class="dib"><span>Symbol</span></li>
+      </ul>
+      
+      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=4958764" target="_blank" class="nav-more">查看项目</a>
+      
+    </div>
+    <div class="tab-container">
+      <div class="content unicode" style="display: block;">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe608;</span>
+                <div class="name">登录-记住密码-选择</div>
+                <div class="code-name">&amp;#xe608;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6c6;</span>
+                <div class="name">记住密码_pre</div>
+                <div class="code-name">&amp;#xe6c6;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6cd;</span>
+                <div class="name">记住密码</div>
+                <div class="code-name">&amp;#xe6cd;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe638;</span>
+                <div class="name">用户</div>
+                <div class="code-name">&amp;#xe638;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6e1;</span>
+                <div class="name">闭眼_线</div>
+                <div class="code-name">&amp;#xe6e1;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe622;</span>
+                <div class="name">箭头</div>
+                <div class="code-name">&amp;#xe622;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe623;</span>
+                <div class="name">箭头2</div>
+                <div class="code-name">&amp;#xe623;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe624;</span>
+                <div class="name">箭头3</div>
+                <div class="code-name">&amp;#xe624;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe625;</span>
+                <div class="name">箭头4</div>
+                <div class="code-name">&amp;#xe625;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe632;</span>
+                <div class="name">密码填充</div>
+                <div class="code-name">&amp;#xe632;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe614;</span>
+                <div class="name">身份证</div>
+                <div class="code-name">&amp;#xe614;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xeb03;</span>
+                <div class="name">箭头_列表向右</div>
+                <div class="code-name">&amp;#xeb03;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xeb04;</span>
+                <div class="name">箭头_列表向左</div>
+                <div class="code-name">&amp;#xeb04;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61f;</span>
+                <div class="name">密码</div>
+                <div class="code-name">&amp;#xe61f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe62a;</span>
+                <div class="name">全屏 </div>
+                <div class="code-name">&amp;#xe62a;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">编辑</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe600;</span>
+                <div class="name">折叠</div>
+                <div class="code-name">&amp;#xe600;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe63d;</span>
+                <div class="name">bg-close</div>
+                <div class="code-name">&amp;#xe63d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6c5;</span>
+                <div class="name">清空</div>
+                <div class="code-name">&amp;#xe6c5;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">unfold</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe7f8;</span>
+                <div class="name">类目 品类 分类 类别.2</div>
+                <div class="code-name">&amp;#xe7f8;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe651;</span>
+                <div class="name">数据</div>
+                <div class="code-name">&amp;#xe651;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe60f;</span>
+                <div class="name">系统</div>
+                <div class="code-name">&amp;#xe60f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe735;</span>
+                <div class="name">出票登记</div>
+                <div class="code-name">&amp;#xe735;</div>
+              </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="unicode-">Unicode 引用</h2>
+          <hr>
+
+          <p>Unicode 是字体在网页端最原始的应用方式,特点是:</p>
+          <ul>
+            <li>支持按字体的方式去动态调整图标大小,颜色等等。</li>
+            <li>默认情况下不支持多色,直接添加多色图标会自动去色。</li>
+          </ul>
+          <blockquote>
+            <p>注意:新版 iconfont 支持两种方式引用多色图标:SVG symbol 引用方式和彩色字体图标模式。(使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。)</p>
+          </blockquote>
+          <p>Unicode 使用步骤如下:</p>
+          <h3 id="-font-face">第一步:拷贝项目下面生成的 <code>@font-face</code></h3>
+<pre><code class="language-css"
+>@font-face {
+  font-family: 'iconfont';
+  src: url('iconfont.woff2?t=1750862168729') format('woff2'),
+       url('iconfont.woff?t=1750862168729') format('woff'),
+       url('iconfont.ttf?t=1750862168729') format('truetype');
+}
+</code></pre>
+          <h3 id="-iconfont-">第二步:定义使用 iconfont 的样式</h3>
+<pre><code class="language-css"
+>.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取字体编码,应用于页面</h3>
+<pre>
+<code class="language-html"
+>&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
+</code></pre>
+          <blockquote>
+            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+          </blockquote>
+          </div>
+      </div>
+      <div class="content font-class">
+        <ul class="icon_lists dib-box">
+          
+          <li class="dib">
+            <span class="icon iconfont icon-denglu-jizhumima-xuanze"></span>
+            <div class="name">
+              登录-记住密码-选择
+            </div>
+            <div class="code-name">.icon-denglu-jizhumima-xuanze
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jizhumima_pre"></span>
+            <div class="name">
+              记住密码_pre
+            </div>
+            <div class="code-name">.icon-jizhumima_pre
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jizhumima"></span>
+            <div class="name">
+              记住密码
+            </div>
+            <div class="code-name">.icon-jizhumima
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yonghu"></span>
+            <div class="name">
+              用户
+            </div>
+            <div class="code-name">.icon-yonghu
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-Close"></span>
+            <div class="name">
+              闭眼_线
+            </div>
+            <div class="code-name">.icon-Close
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou"></span>
+            <div class="name">
+              箭头
+            </div>
+            <div class="code-name">.icon-jiantou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou2"></span>
+            <div class="name">
+              箭头2
+            </div>
+            <div class="code-name">.icon-jiantou2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou3"></span>
+            <div class="name">
+              箭头3
+            </div>
+            <div class="code-name">.icon-jiantou3
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou4"></span>
+            <div class="name">
+              箭头4
+            </div>
+            <div class="code-name">.icon-jiantou4
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mimatianchong"></span>
+            <div class="name">
+              密码填充
+            </div>
+            <div class="code-name">.icon-mimatianchong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shenfenzheng"></span>
+            <div class="name">
+              身份证
+            </div>
+            <div class="code-name">.icon-shenfenzheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou_liebiaoxiangyou"></span>
+            <div class="name">
+              箭头_列表向右
+            </div>
+            <div class="code-name">.icon-jiantou_liebiaoxiangyou
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-jiantou_liebiaoxiangzuo"></span>
+            <div class="name">
+              箭头_列表向左
+            </div>
+            <div class="code-name">.icon-jiantou_liebiaoxiangzuo
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-mima"></span>
+            <div class="name">
+              密码
+            </div>
+            <div class="code-name">.icon-mima
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quanping"></span>
+            <div class="name">
+              全屏 
+            </div>
+            <div class="code-name">.icon-quanping
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-bianji"></span>
+            <div class="name">
+              编辑
+            </div>
+            <div class="code-name">.icon-bianji
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zhedie2"></span>
+            <div class="name">
+              折叠
+            </div>
+            <div class="code-name">.icon-zhedie2
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-bg-close"></span>
+            <div class="name">
+              bg-close
+            </div>
+            <div class="code-name">.icon-bg-close
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-qingkong"></span>
+            <div class="name">
+              清空
+            </div>
+            <div class="code-name">.icon-qingkong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-a-biaozhu33x"></span>
+            <div class="name">
+              unfold
+            </div>
+            <div class="code-name">.icon-a-biaozhu33x
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-order-center"></span>
+            <div class="name">
+              类目 品类 分类 类别.2
+            </div>
+            <div class="code-name">.icon-order-center
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-statistics-center"></span>
+            <div class="name">
+              数据
+            </div>
+            <div class="code-name">.icon-statistics-center
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-system-manage"></span>
+            <div class="name">
+              系统
+            </div>
+            <div class="code-name">.icon-system-manage
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-ticket-manage"></span>
+            <div class="name">
+              出票登记
+            </div>
+            <div class="code-name">.icon-ticket-manage
+            </div>
+          </li>
+          
+        </ul>
+        <div class="article markdown">
+        <h2 id="font-class-">font-class 引用</h2>
+        <hr>
+
+        <p>font-class 是 Unicode 使用方式的一种变种,主要是解决 Unicode 书写不直观,语意不明确的问题。</p>
+        <p>与 Unicode 使用方式相比,具有如下特点:</p>
+        <ul>
+          <li>相比于 Unicode 语意明确,书写更直观。可以很容易分辨这个 icon 是什么。</li>
+          <li>因为使用 class 来定义图标,所以当要替换图标时,只需要修改 class 里面的 Unicode 引用。</li>
+        </ul>
+        <p>使用步骤如下:</p>
+        <h3 id="-fontclass-">第一步:引入项目下面生成的 fontclass 代码:</h3>
+<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
+</code></pre>
+        <h3 id="-">第二步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
+</code></pre>
+        <blockquote>
+          <p>"
+            iconfont" 是你项目下的 font-family。可以通过编辑项目查看,默认是 "iconfont"。</p>
+        </blockquote>
+      </div>
+      </div>
+      <div class="content symbol">
+          <ul class="icon_lists dib-box">
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-denglu-jizhumima-xuanze"></use>
+                </svg>
+                <div class="name">登录-记住密码-选择</div>
+                <div class="code-name">#icon-denglu-jizhumima-xuanze</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jizhumima_pre"></use>
+                </svg>
+                <div class="name">记住密码_pre</div>
+                <div class="code-name">#icon-jizhumima_pre</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jizhumima"></use>
+                </svg>
+                <div class="name">记住密码</div>
+                <div class="code-name">#icon-jizhumima</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yonghu"></use>
+                </svg>
+                <div class="name">用户</div>
+                <div class="code-name">#icon-yonghu</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-Close"></use>
+                </svg>
+                <div class="name">闭眼_线</div>
+                <div class="code-name">#icon-Close</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou"></use>
+                </svg>
+                <div class="name">箭头</div>
+                <div class="code-name">#icon-jiantou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou2"></use>
+                </svg>
+                <div class="name">箭头2</div>
+                <div class="code-name">#icon-jiantou2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou3"></use>
+                </svg>
+                <div class="name">箭头3</div>
+                <div class="code-name">#icon-jiantou3</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou4"></use>
+                </svg>
+                <div class="name">箭头4</div>
+                <div class="code-name">#icon-jiantou4</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mimatianchong"></use>
+                </svg>
+                <div class="name">密码填充</div>
+                <div class="code-name">#icon-mimatianchong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shenfenzheng"></use>
+                </svg>
+                <div class="name">身份证</div>
+                <div class="code-name">#icon-shenfenzheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou_liebiaoxiangyou"></use>
+                </svg>
+                <div class="name">箭头_列表向右</div>
+                <div class="code-name">#icon-jiantou_liebiaoxiangyou</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-jiantou_liebiaoxiangzuo"></use>
+                </svg>
+                <div class="name">箭头_列表向左</div>
+                <div class="code-name">#icon-jiantou_liebiaoxiangzuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-mima"></use>
+                </svg>
+                <div class="name">密码</div>
+                <div class="code-name">#icon-mima</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quanping"></use>
+                </svg>
+                <div class="name">全屏 </div>
+                <div class="code-name">#icon-quanping</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bianji"></use>
+                </svg>
+                <div class="name">编辑</div>
+                <div class="code-name">#icon-bianji</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zhedie2"></use>
+                </svg>
+                <div class="name">折叠</div>
+                <div class="code-name">#icon-zhedie2</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bg-close"></use>
+                </svg>
+                <div class="name">bg-close</div>
+                <div class="code-name">#icon-bg-close</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-qingkong"></use>
+                </svg>
+                <div class="name">清空</div>
+                <div class="code-name">#icon-qingkong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-biaozhu33x"></use>
+                </svg>
+                <div class="name">unfold</div>
+                <div class="code-name">#icon-a-biaozhu33x</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-order-center"></use>
+                </svg>
+                <div class="name">类目 品类 分类 类别.2</div>
+                <div class="code-name">#icon-order-center</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-statistics-center"></use>
+                </svg>
+                <div class="name">数据</div>
+                <div class="code-name">#icon-statistics-center</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-system-manage"></use>
+                </svg>
+                <div class="name">系统</div>
+                <div class="code-name">#icon-system-manage</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ticket-manage"></use>
+                </svg>
+                <div class="name">出票登记</div>
+                <div class="code-name">#icon-ticket-manage</div>
+            </li>
+          
+          </ul>
+          <div class="article markdown">
+          <h2 id="symbol-">Symbol 引用</h2>
+          <hr>
+
+          <p>这是一种全新的使用方式,应该说这才是未来的主流,也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
+            这种用法其实是做了一个 SVG 的集合,与另外两种相比具有如下特点:</p>
+          <ul>
+            <li>支持多色图标了,不再受单色限制。</li>
+            <li>通过一些技巧,支持像字体那样,通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
+            <li>兼容性较差,支持 IE9+,及现代浏览器。</li>
+            <li>浏览器渲染 SVG 的性能一般,还不如 png。</li>
+          </ul>
+          <p>使用步骤如下:</p>
+          <h3 id="-symbol-">第一步:引入项目下面生成的 symbol 代码:</h3>
+<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
+</code></pre>
+          <h3 id="-css-">第二步:加入通用 CSS 代码(引入一次就行):</h3>
+<pre><code class="language-html">&lt;style&gt;
+.icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+&lt;/style&gt;
+</code></pre>
+          <h3 id="-">第三步:挑选相应图标并获取类名,应用于页面:</h3>
+<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
+  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
+&lt;/svg&gt;
+</code></pre>
+          </div>
+      </div>
+
+    </div>
+  </div>
+  <script>
+  $(document).ready(function () {
+      $('.tab-container .content:first').show()
+
+      $('#tabs li').click(function (e) {
+        var tabContent = $('.tab-container .content')
+        var index = $(this).index()
+
+        if ($(this).hasClass('active')) {
+          return
+        } else {
+          $('#tabs li').removeClass('active')
+          $(this).addClass('active')
+
+          tabContent.hide().eq(index).fadeIn()
+        }
+      })
+    })
+  </script>
+</body>
+</html>

+ 111 - 0
public/assets/font/iconfont.css

@@ -0,0 +1,111 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4958764 */
+  src: url('iconfont.woff2?t=1750862168729') format('woff2'),
+       url('iconfont.woff?t=1750862168729') format('woff'),
+       url('iconfont.ttf?t=1750862168729') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-denglu-jizhumima-xuanze:before {
+  content: "\e608";
+}
+
+.icon-jizhumima_pre:before {
+  content: "\e6c6";
+}
+
+.icon-jizhumima:before {
+  content: "\e6cd";
+}
+
+.icon-yonghu:before {
+  content: "\e638";
+}
+
+.icon-Close:before {
+  content: "\e6e1";
+}
+
+.icon-jiantou:before {
+  content: "\e622";
+}
+
+.icon-jiantou2:before {
+  content: "\e623";
+}
+
+.icon-jiantou3:before {
+  content: "\e624";
+}
+
+.icon-jiantou4:before {
+  content: "\e625";
+}
+
+.icon-mimatianchong:before {
+  content: "\e632";
+}
+
+.icon-shenfenzheng:before {
+  content: "\e614";
+}
+
+.icon-jiantou_liebiaoxiangyou:before {
+  content: "\eb03";
+}
+
+.icon-jiantou_liebiaoxiangzuo:before {
+  content: "\eb04";
+}
+
+.icon-mima:before {
+  content: "\e61f";
+}
+
+.icon-quanping:before {
+  content: "\e62a";
+}
+
+.icon-bianji:before {
+  content: "\e603";
+}
+
+.icon-zhedie2:before {
+  content: "\e600";
+}
+
+.icon-bg-close:before {
+  content: "\e63d";
+}
+
+.icon-qingkong:before {
+  content: "\e6c5";
+}
+
+.icon-a-biaozhu33x:before {
+  content: "\e604";
+}
+
+.icon-order-center:before {
+  content: "\e7f8";
+}
+
+.icon-statistics-center:before {
+  content: "\e651";
+}
+
+.icon-system-manage:before {
+  content: "\e60f";
+}
+
+.icon-ticket-manage:before {
+  content: "\e735";
+}
+

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 0
public/assets/font/iconfont.js


+ 177 - 0
public/assets/font/iconfont.json

@@ -0,0 +1,177 @@
+{
+  "id": "4958764",
+  "name": "售检票系统",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "9164164",
+      "name": "登录-记住密码-选择",
+      "font_class": "denglu-jizhumima-xuanze",
+      "unicode": "e608",
+      "unicode_decimal": 58888
+    },
+    {
+      "icon_id": "9600180",
+      "name": "记住密码_pre",
+      "font_class": "jizhumima_pre",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "27711524",
+      "name": "记住密码",
+      "font_class": "jizhumima",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "978324",
+      "name": "用户",
+      "font_class": "yonghu",
+      "unicode": "e638",
+      "unicode_decimal": 58936
+    },
+    {
+      "icon_id": "1018904",
+      "name": "闭眼_线",
+      "font_class": "Close",
+      "unicode": "e6e1",
+      "unicode_decimal": 59105
+    },
+    {
+      "icon_id": "1115048",
+      "name": "箭头",
+      "font_class": "jiantou",
+      "unicode": "e622",
+      "unicode_decimal": 58914
+    },
+    {
+      "icon_id": "1115050",
+      "name": "箭头2",
+      "font_class": "jiantou2",
+      "unicode": "e623",
+      "unicode_decimal": 58915
+    },
+    {
+      "icon_id": "1115052",
+      "name": "箭头3",
+      "font_class": "jiantou3",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
+      "icon_id": "1115053",
+      "name": "箭头4",
+      "font_class": "jiantou4",
+      "unicode": "e625",
+      "unicode_decimal": 58917
+    },
+    {
+      "icon_id": "1435236",
+      "name": "密码填充",
+      "font_class": "mimatianchong",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "3007689",
+      "name": "身份证",
+      "font_class": "shenfenzheng",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "5387571",
+      "name": "箭头_列表向右",
+      "font_class": "jiantou_liebiaoxiangyou",
+      "unicode": "eb03",
+      "unicode_decimal": 60163
+    },
+    {
+      "icon_id": "5387574",
+      "name": "箭头_列表向左",
+      "font_class": "jiantou_liebiaoxiangzuo",
+      "unicode": "eb04",
+      "unicode_decimal": 60164
+    },
+    {
+      "icon_id": "7501066",
+      "name": "密码",
+      "font_class": "mima",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "7913439",
+      "name": "全屏 ",
+      "font_class": "quanping",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "8328297",
+      "name": "编辑",
+      "font_class": "bianji",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "10744636",
+      "name": "折叠",
+      "font_class": "zhedie2",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "11882864",
+      "name": "bg-close",
+      "font_class": "bg-close",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "22424015",
+      "name": "清空",
+      "font_class": "qingkong",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "22725585",
+      "name": "unfold",
+      "font_class": "a-biaozhu33x",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "689261",
+      "name": "类目 品类 分类 类别.2",
+      "font_class": "order-center",
+      "unicode": "e7f8",
+      "unicode_decimal": 59384
+    },
+    {
+      "icon_id": "802974",
+      "name": "数据",
+      "font_class": "statistics-center",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "42086706",
+      "name": "系统",
+      "font_class": "system-manage",
+      "unicode": "e60f",
+      "unicode_decimal": 58895
+    },
+    {
+      "icon_id": "42152509",
+      "name": "出票登记",
+      "font_class": "ticket-manage",
+      "unicode": "e735",
+      "unicode_decimal": 59189
+    }
+  ]
+}

BIN
public/assets/font/iconfont.ttf


BIN
public/assets/font/iconfont.woff


BIN
public/assets/font/iconfont.woff2


+ 1 - 0
public/index.html

@@ -7,6 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title>售检票系统</title>
     <link rel="stylesheet" href="./normalize.css">
+    <link rel="stylesheet" href="./assets/font/iconfont.css">
     <!-- 获取拼音首字母 https://github.com/sxei/pinyinjs -->
     <script src="./js/pinyin_dict_firstletter.js"></script>
     <script src="./js/pinyinUtil.js"></script>

+ 8 - 4
src/components/Breadcrumb/index.vue

@@ -66,14 +66,18 @@ export default {
 
 <style lang="scss" scoped>
 .app-breadcrumb {
-   ::v-deep .el-breadcrumb__separator {
-    color: $lightblue;
+  ::v-deep .el-breadcrumb__separator {
+    color: #fff;
   }
 }
 .app-breadcrumb.el-breadcrumb {
-  display: inline-block;  margin-left: 10px; font-size: 14px;  line-height: 50px;
+  display: inline-block;
+  margin-left: 10px;
+  font-size: 14px;
+  line-height: 50px;
   .no-redirect {
-    color: $blue;  cursor: text;
+    color: #fff;
+    cursor: text;
   }
 }
 

+ 1 - 0
src/components/Hamburger/index.vue

@@ -6,6 +6,7 @@
       class="hamburger"
       :class="{'is-active':isActive}"
       style=""
+      fill="#fff"
       viewBox="0 0 1024 1024"
       version="1.1"
       xmlns="http://www.w3.org/2000/svg"

+ 7 - 1
src/components/Layout/components/AppMain.vue

@@ -39,7 +39,13 @@ export default {
 <style lang="scss">
 .app-main {
   // box-shadow: 0 0 10px #ddd;border-radius: 10px;
-  position: absolute; top: 84px; right: 0; bottom: 0; left: 0; overflow-x: hidden!important; background-color: #fff;
+  position: absolute;
+  top: 50px;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow-x: hidden!important;
+  background-color: #fff;
   .el-scrollbar {
     height: 100%;
   }

+ 52 - 72
src/components/Layout/components/Navbar.vue

@@ -11,12 +11,6 @@
     <breadcrumb class="breadcrumb-container" />
 
     <ul class="right-menu">
-      <li style="padding-right:10px; background:rgb(55, 145, 67);color:#fff;padding:3px 5px; border:0">
-        欢迎,{{ $store.state.user.name }}
-      </li>
-      <li v-if="scenicName==='仙门山'">
-        <a @click="openLink">老系统</a>
-      </li>
       <li>
         <router-link to="/index/dashboard">
           首页
@@ -29,93 +23,50 @@
           全屏
         </a>
       </li>
-      <li>
-        <a @click="$refs.password.show()">
-          修改密码
-        </a>
-      </li>
-      <li>
-        <a @click="logout">
-          退出登录
-        </a>
-      </li>
       <li>
         <a @click="$refs.release.render()">
           更新日志
         </a>
       </li>
-      <!-- <error-log class="errLog-container right-menu-item"/> -->
-      <!-- <lang-select class="international right-menu-item"/> -->
-      <!-- <el-tooltip
-        effect="dark"
-        content="帮助"
-        placement="bottom"
-      >
-        <svg-icon icon-class="help" />
-      </el-tooltip>
-
-      <el-tooltip
-        effect="dark"
-        content="全屏"
-        placement="bottom"
-      >
-        <screenfull class="screenfull right-menu-item" />
-      </el-tooltip>
-
-      <el-tooltip
-        effect="dark"
-        content="消息"
-        placement="bottom"
-      >
-        <svg-icon icon-class="message" />
-      </el-tooltip>
-
       <el-dropdown
         class="avatar-container right-menu-item"
         trigger="click"
       >
         <div class="avatar-wrapper">
           <svg-icon icon-class="user" />
-          <i class="el-icon-caret-bottom" />
+          <i class="el-icon-arrow-down" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <router-link to="/index/dashboard">
             <el-dropdown-item>
-              {{ '首页' }}
+              欢迎 {{ $store.state.user.name }}
             </el-dropdown-item>
           </router-link>
           <el-dropdown-item divided>
+            <span
+              @click="$refs.password.show()"
+              style="display:block;"
+            >
+              修改密码
+            </span>
+          </el-dropdown-item>
+          <el-dropdown-item>
             <span
               @click="logout"
               style="display:block;"
             >
-              {{ '退出' }}
+              退出登录
+            </span>
+          </el-dropdown-item>
+          <el-dropdown-item divided>
+            <span style="display:block;">
+              V{{ version }}
             </span>
           </el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown> -->
+      </el-dropdown>
     </ul>
 
-    <div
-      class="appVersion"
-      @click="goDemo">
-      <span
-        v-if="terminalNO"
-        style="margin-right:10px">
-        pos 终端号:{{ terminalNO }}
-      </span>
-      <span>
-        当前版本:{{ version }}
-      </span>
-      <span v-if="appStatus.status===0">
-        【正在下载更新 {{ appStatus.process }}%】
-      </span>
-      <span v-if="appStatus.status===2">
-        <a @click="updateNow">
-          【有新版本,立即更新】
-        </a>
-      </span>
-    </div>
     <!-- <div
       class="termId"
       >
@@ -213,9 +164,31 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;  border-radius: 0 !important; background: $darkgray; position: relative;
+  height: 50px;
+  border-radius: 0 !important;
+  background: $blue;
+  position: relative;
+  color: #fff;
+
+  .avatar-container {
+    margin: 0 10px;
+    cursor: pointer;
+
+    .svg-icon {
+      width: 20px;
+      height: 20px;
+      color: #fff;
+    }
+
+    i {
+      color: #fff;
+    }
+  }
   .hamburger-container {
-    float: left;  height: 50px;  padding: 0 10px; line-height: 58px;
+    float: left;
+    height: 50px;
+    padding: 0 10px;
+    line-height: 58px;
   }
   .breadcrumb-container {
     float: left;
@@ -224,11 +197,18 @@ export default {
     display: inline-block;  vertical-align: top;
   }
   .right-menu {
-    display: flex; float: right;  height: 36px;  align-items: center; font-size: 13px;
-    a{
-      color: $blue;display: inline-block; padding:  0 10px;
+    display: flex;
+    float: right;
+    height: 50px;
+    align-items: center;
+    font-size: 13px;
+    a {
+      color: #fff;
+      display: inline-block;
+      padding: 0 10px;
       &:hover{
-        color: $activeblue;text-decoration: underline;
+        color: #7991AD;
+        text-decoration: none;
       }
     }
     li{

+ 30 - 12
src/components/Layout/components/Sidebar/SidebarItem.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="menu-wrapper">
-    <div class="logo">
-      <!-- <img :src="logo"> -->
+    <!-- <div class="logo">
+      <img :src="logo">
+    </div> -->
+    <div
+      v-if="!isCollapse"
+      class="title">
+      售检票系统
     </div>
     <template
       v-for="item in activeRoutes"
@@ -26,10 +31,10 @@
           :index="item.path+'/'+item.children[0].path"
           :class="{'submenu-title-noDropdown':!isNest}"
         >
-          <svg-icon
-            class="side-icon"
+          <i
             v-if="item.children[0].meta&&item.children[0].meta.icon"
-            :icon-class="item.children[0].meta.icon"
+            class="iconfont svg-icon"
+            :class="`icon-${item.children[0].meta.icon}`"
           />
           <span
             v-if="item.children[0].meta&&item.children[0].meta.title"
@@ -46,10 +51,10 @@
         :key="item.name+item.path"
       >
         <template slot="title">
-          <svg-icon
-            class="side-icon"
+          <i
+            class="iconfont svg-icon"
             v-if="item.meta&&item.meta.icon"
-            :icon-class="item.meta.icon"
+            :class="`icon-${item.meta.icon}`"
           />
           <span
             v-if="item.meta&&item.meta.title"
@@ -65,7 +70,7 @@
           <sidebar-item
             :is-nest="true"
             class="nest-menu"
-            v-if="child.children&&child.children.length>0"
+            v-if="child.children && child.children.length > 0"
             :routes="[child]"
             :key="child.path"
           />
@@ -78,9 +83,10 @@
             <el-menu-item
               :index="item.path+'/'+child.path"
               v-if="child.meta&&!child.meta.hidden">
-              <svg-icon
+              <i
                 v-if="child.meta&&child.meta.icon"
-                :icon-class="child.meta.icon"
+                class="iconfont svg-icon"
+                :class="`icon-${child.meta.icon}`"
               />
               <span
                 v-if="child.meta&&child.meta.title"
@@ -144,6 +150,10 @@ export default {
     isNest: {
       type: Boolean,
       default: false
+    },
+    isCollapse: {
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -221,10 +231,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  text-align: center;
+  padding: 20px 0;
+  color: #333;
+  font-size: 24px;
+  font-weight: bold;
+}
 .logo{
   text-align: center;
   img{
-   height: 60px;padding: 10px 0;
+    height: 60px;
+    padding: 10px 0;
   }
   &:after{
     content: '';display: block; height: 0;border-bottom: 1px solid lighten($blue,8%);border-top: 1px solid darken($blue,8%);

+ 6 - 4
src/components/Layout/components/Sidebar/index.vue

@@ -7,11 +7,13 @@
         :show-timeout="200"
         :default-active="$route.path"
         :collapse="isCollapse"
-        background-color="#0075ff"
-        text-color="#fff"
-        active-text-color="#fff"
+        background-color="#fff"
+        text-color="#333333"
+        active-text-color="#3F70FF"
       >
-        <sidebar-item :routes="permissionRouters" />
+        <sidebar-item
+          :routes="permissionRouters"
+          :is-collapse="isCollapse" />
       </el-menu>
     </el-scrollbar>
   </div>

+ 61 - 12
src/components/Layout/components/TagsView.vue

@@ -10,7 +10,7 @@
       <router-link
         ref="tag"
         class="tags-view-item"
-        :class="isActive(tag)?'active':''"
+        :class="isActive(tag) ? 'active' : ''"
         v-for="tag in Array.from(visitedViews)"
         :to="tag.path"
         :key="tag.path"
@@ -143,14 +143,39 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .tags-view-container {
   .tags-view-wrapper {
-    height: 34px;  background: $darkgray;
+    height: 40px;
+    background: #F8F9FD;
+    border: 1px solid #E4E6ED;
+    box-shadow: 6px 0px 12px 0px #DCDFE6;
     &:before {
-      position: absolute;bottom: 0; left: 0; z-index: 3;width: 100%;content: '';border-bottom: 3px solid $blue;
+      position: absolute;
+      bottom: 0; left: 0;
+      z-index: 3;
+      width: 100%;
+      content: '';
+      border-bottom: 1 solid #E4E6ED;
     }
     .tags-view-item {
-      position: relative;  z-index: 1; display: inline-block;  height: 28px;  padding: 0 10px;  margin-top: 6px;  margin-left: -1px; font-size: 13px;  line-height: 28px;  color: #495060; border-top-left-radius: 5px;border-top-right-radius: 5px;transition: background .5s;
+      position: relative;
+      z-index: 1;
+      display: inline-block;
+      height: 40px;
+      line-height: 40px;
+      padding: 0 20px;
+      margin-left: -1px;
+      font-size: 16px;
+      color: #555555;
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+      transition: background .5s;
       &:before,&:after {
-        position: absolute; top: 5px; right: 0; width: 1px ; height: 14px;  content: ''; background: #b8b8b8;
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 1px ;
+        height: 40px;
+        content: '';
+        background: #F8F9FD;
       }
       &:after {
         left: 0;
@@ -162,14 +187,18 @@ export default {
         }
       }
       &:hover {
-        background: darken($gray,5%); z-index: 2;
+        background: darken($gray,5%);
+        color: $blue;
+        z-index: 2;
         &:before,&:after {
           display: none;
         }
       }
 
       &.active {
-        z-index: 4;  color: $blue;  background-color: $gray;
+        z-index: 4;
+        color: $blue;
+        background-color: #E4E6ED;
         &:before,&:after {
           display: none;
         }
@@ -185,18 +214,38 @@ export default {
       }
     }
 
-     ::v-deep .el-icon-close {
-      width: 16px;  height: 16px;  text-align: center;  vertical-align: 2px;  border-radius: 50%;  transition: all .3s cubic-bezier(.645, .045, .355, 1);  transform-origin: 100% 50%;
+    ::v-deep .el-icon-close {
+      width: 16px;
+      height: 16px;
+      text-align: center;
+      vertical-align: 0;
+      border-radius: 50%;
+      transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transform-origin: 100% 50%;
       &:before {
-        display: inline-block;  vertical-align: -3px;  transform: scale(.6);
+        display: inline-block;
+        vertical-align: -1px;
+        transform: scale(.6);
       }
       &:hover {
-        color: #fff;  background-color: #b4bccc; box-shadow: 0 0 5px #fff;
+        color: #fff;
+        background-color: #b4bccc;
+        box-shadow: 0 0 5px #fff;
       }
     }
   }
   .contextmenu {
-    position: absolute;  z-index: 100;  padding: 5px 0;  margin: 0;  font-size: 12px;  font-weight: 400;  color: #333;  list-style-type: none;  background: #fff;  border-radius: 4px;  box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+    position: absolute;
+    z-index: 100;
+    padding: 5px 0;
+    margin: 0;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    list-style-type: none;
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
     li {
       padding: 7px 16px;  margin: 0;  cursor: pointer;
       &:hover {

+ 3 - 11
src/components/Layout/components/project/Red/layout-comp/Sidebar/SidebarItem.vue

@@ -1,13 +1,10 @@
 <template>
   <div class="menu-wrapper">
-    <div class="logo">
+    <!-- <div class="logo">
       <div style="padding-top: 15px;">
-        <!-- <img :src="logo"> -->
+        <img :src="logo">
       </div>
-      <!-- <div style="font-size: 25px;color: white; padding-bottom: 30px;padding-top: 10px;">
-        长沙雷锋纪念馆
-      </div> -->
-    </div>
+    </div> -->
     <template
       v-for="item in activeRoutes"
     >
@@ -138,11 +135,6 @@ export default {
   img{
    height: 60px;padding: 10px 0;
   }
-/*
-  &:after{
-    content: '';display: block; height: 0;border-bottom: 1px solid lighten($red,8%);border-top: 1px solid darken($red,8%);
-  }
-*/
 }
 .side-icon{
   font-size: 24px; vertical-align: middle !important;

+ 8 - 33
src/components/Layout/index.vue

@@ -5,38 +5,15 @@
     @mousemove="cmousemoved"
   >
     <div
-      v-if="device==='mobile'&&sidebar.opened"
+      v-if="device === 'mobile' && sidebar.opened"
       class="drawer-bg"
       @click="handleClickOutside"
     />
-    <!--
-    <sidebar class="sidebar-container" />
-    <div class="main-container">
-      <navbar ref="nav" />
-      <tags-view></tags-view>
-      <app-main />
-    </div>
-     -->
-    <!-- 红色雷锋定制 sidebar-->
-    <sidebar-red
-      v-if="projectName === 'leifengjinianguan'"
-      class="sidebar-container" />
-    <sidebar
-      v-else
-      class="sidebar-container" />
+    <navbar ref="nav" />
     <!-- 红色雷锋定制 navbar-->
-    <div
-      class="main-container"
-      style="background-image: url(./images/changshaleifeng/leifeng-bg.png);background-size: 100%;"
-      v-if="projectName === 'leifengjinianguan'">
-      <navbar-red ref="nav" />
-      <tags-view-red></tags-view-red>
-      <app-main />
-    </div>
-    <div
-      class="main-container"
-      v-else>
-      <navbar ref="nav" />
+    <div class="main-container">
+      <sidebar
+        class="sidebar-container" />
       <tags-view></tags-view>
       <app-main />
     </div>
@@ -47,7 +24,7 @@
 /*
 import { Navbar, Sidebar, AppMain, TagsView } from './components'
 */
-import { Navbar, Sidebar, AppMain, TagsView, NavbarRed, SidebarRed, TagsViewRed } from './components'
+import { Navbar, Sidebar, AppMain, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { getSystemConfigList } from '@/api/systemConfig'
 
@@ -57,10 +34,7 @@ export default {
     Navbar,
     Sidebar,
     AppMain,
-    TagsView,
-    NavbarRed,
-    SidebarRed,
-    TagsViewRed
+    TagsView
   },
   mixins: [ResizeMixin],
   computed: {
@@ -145,6 +119,7 @@ export default {
     position: relative;
     height: 100%;
     width: 100%;
+    overflow-x: hidden;
   }
   .drawer-bg {
     background: #000;

+ 2 - 4
src/pages/login/index.vue

@@ -151,10 +151,8 @@ export default {
       appName: this.$localStore.get('appName') || process.env.VUE_APP_PROJECT_NAME,
       loginForm: {
         projectName: '',
-        // userName: 'admin',
-        // password: 'Aa123456',
-        userName: 'admin2',
-        password: '1234.Abcd',
+        userName: 'admin',
+        password: 'Aa123456',
         authcode: ''
       },
       loginRules: {

+ 70 - 70
src/release.scss

@@ -7,7 +7,7 @@
         line-height: .6563em;
         margin: .6563em 0;
     }
-    
+
     h2 {
         color: #6699cc;
         font-size: 1.75em;
@@ -15,44 +15,44 @@
         border-bottom: 1px solid #eee;
         margin-top:30px;
     }
-    
+
     h3 {
         color: #6699cc;
         font-size: 1.5em;
     line-height: 1.43;
     }
-    
+
     h4 {
         color: #6699cc;
         font-size: 1.2857em;
         line-height: 1.1667em;
         margin: 1.1667em 0;
     }
-    
+
     h5 {
         color: #6699cc;
         font-size: 1.15em;
         line-height: 1.3em;
         margin: 1.3em 0;
     }
-    
+
     h6 {
         color: #6699cc;
         font-size: 1em;
         line-height: 1.5em;
         margin: 1.5em 0;
     }
-    
+
     h1,h2,h3,h4,h5,h6 {
         line-height: 1.5em;
     }
-    
+
     body,p,td,div {
         color: #515151;
         font-family: "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
         word-wrap: break-word;
     }
-    
+
     a {
         -webkit-transition: color .2s ease-in-out;
         -moz-transition: color .2s ease-in-out;
@@ -62,15 +62,15 @@
         color: #f99157;
         text-decoration: none;
     }
-    
-    a[href^="mailto"] { 
+
+    a[href^="mailto"] {
         color: #66cccc;
     }
-    
+
     a:hover {
         color: #f99157;
     }
-    
+
     ul{
         padding-left: 30px; margin:0.8em 0
     }
@@ -78,46 +78,46 @@
     li {
         font-size: 110%;margin-bottom: 5px;
     }
-    
+
     li li {
         font-size: 100%;
     }
-    
+
     li p {
         font-size: 100%;
         margin: .5em 0;
     }
-    
+
     .footnote {
         color: #a09f93;
         font-size: .8em;
         vertical-align: super;
     }
-    
+
     hr {
         height: 10px;
         border: none;
         background-color: #d3d0c8;
         color: #515151;
     }
-    
+
     #wrapper img {
         max-width: 100%;
         height: auto;
     }
-    
+
     strong, b {
         color: #ffcc66;
     }
-    
+
     em, i {
         color: #cc99cc;
     }
-    
+
     dd {
         margin-bottom: 1em;
     }
-    
+
     li {
         list-style: none;
         position: relative;
@@ -132,31 +132,31 @@
         font-size: 160%;
         content: '\2022';
     }
-    
+
     ol {
         counter-reset: index;
     }
-    
+
     ol li {
         counter-increment: index;
     }
-    
+
     ol li::before {
         content: counter(index) ".";
     }
-    
+
     li > p:first-child {
         margin: 0;
     }
-    
+
     ul ul,ul ol {
         margin-bottom: .4em;
     }
-    
+
     caption,col,colgroup,table,tbody,td,tfoot,th,thead,tr {
         border-spacing: 0;
     }
-    
+
     table {
         border: 1px solid rgba(0,0,0,0.25);
         border-collapse: collapse;
@@ -166,68 +166,68 @@
         padding: 0;
         table-layout: fixed;
     }
-    
+
     caption {
         display: table-caption;
         font-weight: 700;
     }
-    
+
     col {
         display: table-column;
     }
-    
+
     colgroup {
         display: table-column-group;
     }
-    
+
     tbody {
         display: table-row-group;
     }
-    
+
     tfoot {
         display: table-footer-group;
     }
-    
+
     thead {
         display: table-header-group;
     }
-    
+
     td,th {
         display: table-cell;
     }
-    
+
     tr {
         display: table-row;
     }
-    
+
     table th,table td {
         font-size: 1.1em;
         line-height: 23px;
         padding: 0 1em;
     }
-    
+
     table thead {
         background: rgba(0,0,0,0.15);
         border: 1px solid rgba(0,0,0,0.15);
         border-bottom: 1px solid rgba(0,0,0,0.2);
     }
-    
+
     table tbody {
         background: rgba(0,0,0,0.05);
     }
-    
+
     table tfoot {
         background: rgba(0,0,0,0.15);
         border: 1px solid rgba(0,0,0,0.15);
         border-top: 1px solid rgba(0,0,0,0.2);
     }
-    
+
     figure {
         display: inline-block;
         position: relative;
         margin: 1em 0 2em;
     }
-    
+
     figcaption {
         font-style: italic;
         text-align: center;
@@ -244,15 +244,15 @@
         -ms-transition: all .2s ease-in-out;
         transition: all .2s ease-in-out;
     }
-    
+
     figure:hover>figcaption {
         /* background: rgba(0,0,0,1) */
     }
-    
+
     code {
         color: #99cc99;
     }
-    
+
     .poetry pre {
         display: block;
         font-family: Georgia, Garamond, serif !important;
@@ -261,17 +261,17 @@
         line-height: 1.6em;
         margin-left: 1em;
     }
-    
+
     .poetry pre code {
         font-family: Georgia, Garamond, serif !important;
     }
-    
+
     blockquote p {
         font-size: 110%;
         font-style: italic;
         line-height: 1.6em;
     }
-    
+
     sup,sub,a.footnote {
         font-size: 1.4ex;
         height: 0;
@@ -279,39 +279,39 @@
         position: relative;
         vertical-align: super;
     }
-    
+
     sub {
         vertical-align: sub;
         top: -1px;
     }
-    
+
     p,h5 {
         font-size: 1.1429em;
         line-height: 1.3125em;
         margin: 1.3125em 0;
     }
-    
+
     dt,th {
         font-weight: 700;
     }
-    
+
     table tr:nth-child(odd),table th:nth-child(odd),table td:nth-child(odd) {
         background: rgba(255,255,255,0.06);
     }
-    
+
     table tr:nth-child(even),table td:nth-child(even) {
         background: rgba(200,200,200,0.25);
     }
-    
+
     @media print {
         body {
             overflow: auto;
         }
-    
+
         img,pre,blockquote,table,figure,p {
             page-break-inside: avoid;
         }
-    
+
         #wrapper {
             background-color: #f2f0ec;
             color: #515151;
@@ -321,29 +321,29 @@
             text-indent: 0;
         }
     }
-    
+
     @media screen {
         .inverted #wrapper,.inverted {
             background: #2d2d2d;
         }
-    
+
         .inverted hr {
             color: #d3d0c8;
             background-color: 515151
         }
-    
+
         .inverted p,.inverted td, .inverted div {
             color: #d3d0c8 !important;
         }
-    
+
         .inverted table tr:nth-child(odd),.inverted table th:nth-child(odd),.inverted table td:nth-child(odd) {
             background: none;
         }
-    
+
         #wrapper {
             padding: 20px;
         }
-    
+
         ::selection {
             background: #d3d0c8;
             color: #515151;
@@ -352,37 +352,37 @@
             color: #d3d0c8;
             background: #515151;
         }
-    
+
         h1::selection {
             background-color: rgba(45, 156, 208, .3);
         }
-    
+
         h2::selection {
             background-color: rgba(90, 182, 224, .3);
         }
-    
+
         h3::selection,h4::selection,h5::selection,h6::selection,li::selection,ol::selection {
             background-color: rgba(133, 201, 232, .3);
         }
-    
+
         code::selection {
             background-color: rgba(0,0,0,.7);
             color: #eee;
         }
-    
+
         code span::selection {
             background-color: rgba(0,0,0,.7) !important;
             color: #eee !important;
         }
-    
+
         a::selection {
             background-color: rgba(255, 230, 102,.2);
         }
-    
+
         .inverted a::selection {
             background-color: rgba(255, 230, 102,.6);
         }
-    
+
         td::selection,th::selection,caption::selection {
             background-color: rgba(180, 237, 95, .5);
         }

+ 4 - 4
src/router/index.js

@@ -82,7 +82,7 @@ let routerMap = [
     path: '/ticketSale',
     component: Layout,
     name: '订单中心',
-    meta: { title: '订单中心', icon: 'ticketSale', permissionName: 'order-center' },
+    meta: { title: '订单中心', icon: 'order-center', permissionName: 'order-center' },
     redirect: 'noredirect',
     alwaysShow: true,
     children: [
@@ -122,7 +122,7 @@ let routerMap = [
     path: '/ticketSetting',
     component: Layout,
     name: '票务管理',
-    meta: { title: '票务管理', icon: 'ticketSetting', permissionName: 'ticket-manage' },
+    meta: { title: '票务管理', icon: 'ticket-manage', permissionName: 'ticket-manage' },
     redirect: 'noredirect',
     alwaysShow: true,
     children: [
@@ -204,7 +204,7 @@ let routerMap = [
     path: '/queryReport',
     component: Layout,
     name: '数据中心',
-    meta: { title: '数据中心', icon: 'queryform', permissionName: 'statistics-center' },
+    meta: { title: '数据中心', icon: 'statistics-center', permissionName: 'statistics-center' },
     redirect: 'noredirect',
     alwaysShow: true,
     children: [
@@ -262,7 +262,7 @@ let routerMap = [
     path: '/systemSetting',
     component: Layout,
     name: '系统管理',
-    meta: { title: '系统管理', icon: 'systemSetting', permissionName: 'system-manage' },
+    meta: { title: '系统管理', icon: 'system-manage', permissionName: 'system-manage' },
     redirect: 'noredirect',
     alwaysShow: true,
     children: [

+ 58 - 16
src/styles/sidebar.scss

@@ -1,7 +1,7 @@
 #app {
   // 主体区域
   .main-container {
-    min-height: 100%;
+    min-height: calc(100% - 50px);
     transition: margin-left .28s;
     margin-left: 220px;
     position: relative;
@@ -12,7 +12,7 @@
     width: 220px !important;
     position: fixed;
     font-size: 0px;
-    top: 0px;
+    top: 50px;
     bottom: 0;
     left: 0;
     z-index: 1001;
@@ -20,10 +20,11 @@
     display: flex;
     flex-direction: column;
     justify-content: space-between;
+    border-right: 1px solid #E1E4EC;
     .el-scrollbar{
       flex: 1
     }
-    
+
     //reset element-ui css
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
@@ -41,14 +42,66 @@
       display: inline-block;
       width: 100%;
       overflow: hidden;
+      border-radius: 8px;
+      margin: 4px 0;
     }
     .svg-icon {
+      color: #333;
       margin-right: 10px;
     }
     .el-menu {
       border: none;
       height: 100%;
-      width: 100% !important;
+      width: calc(100% - 20px) !important;
+      padding: 0 10px;
+
+      .el-submenu__title {
+        font-weight: bold;
+        font-size: 16px;
+      }
+    }
+
+    .el-submenu.is-opened .el-submenu__title{
+      background-color: $blue !important;
+      color: #fff !important;
+
+      i {
+        color: #fff !important;
+      }
+
+      &:hover {
+        background-color: $blue !important;
+        color: #fff !important;
+      }
+    }
+
+    .el-submenu .el-submenu__title,
+    .el-submenu .el-menu-item {
+      height: 40px !important;
+      line-height: 40px !important;
+      min-width: 201px !important;
+      border-radius: 8px;
+
+      &:hover {
+        color: $blue !important;
+        background-color: #EBEDFA !important;
+      }
+    }
+    .el-submenu .el-submenu__title {
+      &:hover {
+        color: $blue !important;
+        background-color: #EBEDFA !important;
+      }
+    }
+
+    .el-menu-item.is-active,.sidebar-container .el-submenu .el-menu-item.is-active{
+      background: $blue !important;
+      color: #fff !important;
+
+      &:hover {
+        background: $blue !important;
+        color: #fff !important;
+      }
     }
   }
   .hideSidebar {
@@ -91,18 +144,7 @@
       }
     }
   }
-  .sidebar-container .nest-menu .el-submenu>.el-submenu__title,
-  .sidebar-container .el-submenu .el-menu-item {
-    min-width: 220px !important;
-    background-color: $lighterblue !important;
-    &:hover {
-      background-color: $lightblue !important;
-    }
-  }
-  .sidebar-container .el-menu-item.is-active,.sidebar-container .el-submenu .el-menu-item.is-active{
-    background: $activeblue  !important;
-  }
-  
+
   .el-menu--collapse .el-menu .el-submenu {
     min-width: 220px !important;
   }