fix

src/assets/iconfont/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;
+}

src/assets/iconfont/demo_index.html

@@ -0,0 +1,280 @@
+<!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=4444844" 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">&#xe634;</span>
+                <div class="name">首页</div>
+                <div class="code-name">&amp;#xe634;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe891;</span>
+                <div class="name">扫一扫</div>
+                <div class="code-name">&amp;#xe891;</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">&#xe65f;</span>
+                <div class="name">向右箭头</div>
+                <div class="code-name">&amp;#xe65f;</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=1721879246550') format('woff2'),
+       url('iconfont.woff?t=1721879246550') format('woff'),
+       url('iconfont.ttf?t=1721879246550') 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-shouye"></span>
+            <div class="name">
+              首页
+            </div>
+            <div class="code-name">.icon-shouye
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-saoyisao"></span>
+            <div class="name">
+              扫一扫
+            </div>
+            <div class="code-name">.icon-saoyisao
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-wode"></span>
+            <div class="name">
+              我的
+            </div>
+            <div class="code-name">.icon-wode
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiangyoujiantou"></span>
+            <div class="name">
+              向右箭头
+            </div>
+            <div class="code-name">.icon-xiangyoujiantou
+            </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-shouye"></use>
+                </svg>
+                <div class="name">首页</div>
+                <div class="code-name">#icon-shouye</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-saoyisao"></use>
+                </svg>
+                <div class="name">扫一扫</div>
+                <div class="code-name">#icon-saoyisao</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-wode"></use>
+                </svg>
+                <div class="name">我的</div>
+                <div class="code-name">#icon-wode</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiangyoujiantou"></use>
+                </svg>
+                <div class="name">向右箭头</div>
+                <div class="code-name">#icon-xiangyoujiantou</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>

src/assets/iconfont/iconfont.css

@@ -0,0 +1,31 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 4444844 */
+  src: url('iconfont.woff2?t=1721879246550') format('woff2'),
+       url('iconfont.woff?t=1721879246550') format('woff'),
+       url('iconfont.ttf?t=1721879246550') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-shouye:before {
+  content: "\e634";
+}
+
+.icon-saoyisao:before {
+  content: "\e891";
+}
+
+.icon-wode:before {
+  content: "\e603";
+}
+
+.icon-xiangyoujiantou:before {
+  content: "\e65f";
+}
+

src/assets/iconfont/iconfont.json

@@ -0,0 +1,37 @@
+{
+  "id": "4444844",
+  "name": "信栖网络",
+  "font_family": "iconfont",
+  "css_prefix_text": "icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "1435243",
+      "name": "首页",
+      "font_class": "shouye",
+      "unicode": "e634",
+      "unicode_decimal": 58932
+    },
+    {
+      "icon_id": "2076266",
+      "name": "扫一扫",
+      "font_class": "saoyisao",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "4406740",
+      "name": "我的",
+      "font_class": "wode",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "630094",
+      "name": "向右箭头",
+      "font_class": "xiangyoujiantou",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    }
+  ]
+}

src/components/tabbar.vue

@@ -1,16 +1,21 @@
 <template>
+  
   <div class="">
-    <van-tabbar route="" v-model="active" class="tabbar" active-color="#01c4b8" inactive-color="#999999">
+    <van-tabbar route="" v-model="active" class="tabbar" active-color="#0c2469" inactive-color="#999999">
       <van-tabbar-item replace to="/">
         <span>首页</span>
         <template #icon="props">
-          <img :src="props.active ? icon.inactive1 : icon.active1" />
+          <span v-if="active" class="iconfont icon-shouye"></span>
+          <span v-else class="iconfont icon-shouye"></span>
+          <!-- <img :src="props.active ? icon.inactive1 : icon.active1" /> -->
         </template>
       </van-tabbar-item>
       <van-tabbar-item  replace  to="/My">
         <span>我的</span>
         <template #icon="props">
-          <img :src="props.active ? icon.inactive3 : icon.active3" />
+          <span v-if="active" class="iconfont icon-wode"></span>
+          <span v-else class="iconfont icon-wode"></span>
+          <!-- <img :src="props.active ? icon.inactive3 : icon.active3" /> -->
         </template>
       </van-tabbar-item>
      <!-- <van-tabbar-item icon="search">标签</van-tabbar-item>

src/main.js

@@ -16,6 +16,7 @@ import backIndex from './components/backindex.vue'
 import Vant from 'vant'
 import 'vant/lib/index.less'
 import request from "@/utils/request"
+import '@/assets/iconfont/iconfont.css';
 // import VConsole from 'vconsole';
 
 // const vconsole = new VConsole()

src/pages/components/HomePage.vue

@@ -6,7 +6,8 @@
         @search="onSearch"
         placeholder="点击搜索单号"
       />
-      <img @click="wxScanCode()" src="@/assets/user/u4.png" alt="" />
+      <span @click="wxScanCode()" class="iconfont icon-saoyisao iconStyle"></span>
+      <!-- <img  src="@/assets/user/u4.png" alt="" /> -->
     </form>
     <!-- 显示 -->
     <div>
@@ -20,15 +21,15 @@
           <div id="myChart1" style="width: 100%;"></div>
           <div class="legend">
             <div @click="action(0)">
-              <div class="ball"></div>
+              <div class="ball" style="background-color: #0c2469;"></div>
               <div>签收成功</div>
             </div>
             <div @click="action(1)">
-              <div class="ball" style="background-color: #f98407;"></div>
+              <div class="ball" style="background-color: #f6f93c;"></div>
               <div>派件中</div>
             </div>
             <div @click="action(2)">
-              <div class="ball" style="background-color: #f9df07;"></div>
+              <div class="ball" style="background-color: #f50707;"></div>
               <div>派件失败</div>
             </div>
           </div>
@@ -38,15 +39,15 @@
           <div id="myChart2" style="width: 100%;"></div>
           <div class="legend">
             <div @click="actionTwo(0)">
-              <div class="ball"></div>
+              <div class="ball" style="background-color: #0c2469;" ></div>
               <div>揽收成功</div>
             </div>
             <div @click="actionTwo(1)">
-              <div class="ball" style="background-color: #f98407;"></div>
+              <div class="ball" style="background-color: #f6f93c;"></div>
               <div>待揽收</div>
             </div>
             <div @click="actionTwo(2)">
-              <div class="ball" style="background-color: #f9df07;"></div>
+              <div class="ball" style="background-color: #f50707;"></div>
               <div>未揽收</div>
             </div>
           </div>
@@ -226,7 +227,7 @@ export default {
                 show: true
               }
             },
-            color: ["#07daf9", "#f98407", "#f9df07", "#079bf9"],
+            color: ["#0c2469", "#f6f93c", "#f50707", "#076bf9"],
             labelLine: {
               show: false
             }
@@ -292,7 +293,7 @@ export default {
                 show: true
               }
             },
-            color: ["#07daf9", "#f98407", "#f9df07", "#079bf9"],
+            color: ["#0c2469", "#f6f93c", "#f50707", "#076bf9"],
             labelLine: {
               show: false
             },
@@ -448,6 +449,7 @@ export default {
     display: flex;
     margin-bottom: 0.2rem;
     justify-content: space-between;
+    align-items: center;
 
     /deep/.van-search {
       width: 100%;
@@ -526,7 +528,6 @@ export default {
           width: 13px;
           height: 13px;
           border-radius: 50%;
-          background-color: #07daf9;
           margin-right: 10px;
           align-items: baseline;
         }
@@ -583,4 +584,10 @@ export default {
     }
   }
 }
+
+.iconStyle {
+  font-size: 0.44rem;
+  color: #0c2469;
+  margin-left: 6px;
+}
 </style>

src/pages/my.vue

@@ -12,11 +12,11 @@
         <p>姓名：{{ user.expressName }}</p>
         <p>{{ user.expressPhone }}</p>
       </div>
-      <img
+      <!-- <img
         style="width: 100%;border-radius: 0px;margin-top: .4rem;"
         src="../assets/images/my_banner.png"
         alt=""
-      />
+      /> -->
     </div>
     <div class="list">
       <router-link to="/Personinfomation">

src/pages/new/removal.vue

@@ -4,7 +4,8 @@
             <form action="">
                 <van-search ref="isSearchFocus" class="search" v-model="keyWorld" @search="onSearch"
                     placeholder="请输入快递单号" />
-                <img @click="onImg" src="@/assets/user/u4.png" alt="">
+                <!-- <img @click="onImg" class="iconStyle" src="@/assets/user/u4.png" alt=""> -->
+                <span @click="onImg" class="iconfont icon-saoyisao iconStyle"></span>
             </form>
             <div class="middelBox" style="height: calc(100vh - 79px);overflow-y: auto;" v-if="show">
                 <div style="margin-bottom: 10px;">已添加快件:</div>
@@ -159,7 +160,7 @@ export default {
     background-color: #fff;
     height: 100vh;
 
-    img {
+    .iconStyle {
         position: fixed;
         height: 20px;
         width: 20px;
@@ -185,4 +186,10 @@ export default {
         margin-right: 22px;
     }
 }
+
+.iconStyle {
+  font-size: 0.44rem;
+  color: #0c2469;
+  margin-left: 6px;
+}
 </style>

src/pages/new/sign.vue

@@ -3,7 +3,8 @@
         <div class="container">
             <form action="" v-if="isCombineVisible">
                 <van-search @search="check" ref="searchRef" class="search" v-model="value" placeholder="请输入快递单号" />
-                <img @click="onImg" src="@/assets/user/u4.png" alt="">
+                <!-- <img @click="onImg" src="@/assets/user/u4.png" alt=""> -->
+                <span @click="onImg" class="iconfont icon-saoyisao iconStyle"></span>
             </form>
 
             <Combine :signList="signList" @onIsCombine="isCombineChange" v-if="isSign"></Combine>
@@ -94,6 +95,17 @@ export default {
     background-color: #fff;
     height: 100vh;
 
+    .iconStyle {
+        font-size: 0.44rem;
+        color: #0c2469;
+        margin-left: 6px;
+        position: fixed;
+        height: 20px;
+        width: 20px;
+        right: 22px;
+        top: 18px;
+    }
+
     img {
         position: fixed;
         height: 20px;

src/pages/new/storage.vue

@@ -11,12 +11,13 @@
             placeholder="快递单号"
             :rules="[{ required: true }]"
           />
-          <img
+          <span @click="wxScanCodeB()" class="iconfont icon-saoyisao iconStyle"></span>
+          <!-- <img
             class="formStyle-top-img"
-            @click="wxScanCodeB()"
+           
             src="@/assets/user/u4.png"
             alt=""
-          />
+          /> -->
         </div>
 
         <van-field
@@ -180,7 +181,7 @@
           class="popupStyle-top-icon"
           @click="searchCrux"
           name="search"
-          color="#1989fa"
+          color="#0c2469"
           size="20"
         />
       </form>
@@ -607,6 +608,18 @@ export default {
     border: none;
   }
 }
+.formStyle-top {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.iconStyle {
+  font-size: 0.44rem;
+  color: #0c2469;
+  margin-left: 6px;
+  margin-right: 6px;
+}
 
 .popupStyle {
   height: 100vh;

src/pages/new/sureCombine.vue

@@ -30,7 +30,7 @@
                     <van-field name="uploader" label="上传照片"  :rules="[{ required: true, message: '请上传图片' }]">
                             <template #input>
                                 <van-uploader   multiple    :deletable="true"  
-                                @delete="onDelete" v-model="uploader" :after-read="afterRead" :before-read="beforeRead" :max-count="1" />
+                                v-model="uploader" :after-read="afterRead" :before-read="beforeRead" :max-count="1" />
                             </template>
                     </van-field>
                 </div>
@@ -78,6 +78,7 @@ export default {
     props: ['isCombine', 'goodsList'],
     data() {
         return {
+            lastclick:'',
             checkbox: false,
             checkboxGroup: [],
             uploader: [],//图片
@@ -158,7 +159,18 @@ export default {
             this.context.stroke();  
         },  
         canvasClose() {
+            if(this.lastclick == '图片') {
+                console.log('11111111')
+                this.isPhotoOrsize = '图片'
+                this.currentSelect = "图片"
+                this.context.clearRect(0, 0, this.width, this.height);  
+                this.hasContent = false;
+                return
+            }
             this.isPhotoOrsize = '图片'
+            this.currentSelect = "签字板"
+            this.context.clearRect(0, 0, this.width, this.height);  
+            this.hasContent = false;
         },
         clearCanvas() {  
             this.context.clearRect(0, 0, this.width, this.height);  
@@ -181,6 +193,7 @@ export default {
             }); 
             this.currentSelect = "签字板"
             this.isPhotoOrsize = '图片'
+            this.lastclick = '签字板' 
             this.context.clearRect(0, 0, this.width, this.height);  
             this.hasContent = false;
         },  
@@ -191,6 +204,7 @@ export default {
                 this.show =true
             }
             if(value == '图片') {
+                this.lastclick = value
                 this.uploader = []
             }
             this.currentSelect = value