diff --git a/src/assets/ch.png b/src/assets/ch.png deleted file mode 100644 index 94e9cbe9f..000000000 Binary files a/src/assets/ch.png and /dev/null differ diff --git a/src/assets/en.png b/src/assets/en.png deleted file mode 100644 index 27c83aa6f..000000000 Binary files a/src/assets/en.png and /dev/null differ diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index 4aa27e6c3..54fe0e959 100644 --- a/src/assets/iconfont/iconfont.css +++ b/src/assets/iconfont/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2208059 */ - src: url("iconfont.woff2?t=1632557807050") format("woff2"), - url("iconfont.woff?t=1632557807050") format("woff"), - url("iconfont.ttf?t=1632557807050") format("truetype"); + src: url("iconfont.woff2?t=1634092870259") format("woff2"), + url("iconfont.woff?t=1634092870259") format("woff"), + url("iconfont.ttf?t=1634092870259") format("truetype"); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.team-iconzuixinlianzai::before { + content: "\e6da"; +} + +.team-iconxinpin::before { + content: "\e614"; +} + +.team-iconxinpinrenqiwang::before { + content: "\e615"; +} + .team-iconinternationality::before { content: "\e67a"; } diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index 840c24b08..8889adf81 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -1,64 +1,64 @@ -!(function (e) { - var t, - c, - l, - n, - o, - i = - '', - h = (h = document.getElementsByTagName("script"))[ - h.length - 1 +!(function (c) { + var l, + t, + h, + e, + i, + v = + '', + a = (a = document.getElementsByTagName("script"))[ + a.length - 1 ].getAttribute("data-injectcss"), - a = function (e, t) { - t.parentNode.insertBefore(e, t); + n = function (c, l) { + l.parentNode.insertBefore(c, l); }; - if (h && !e.__iconfont__svg__cssinject__) { - e.__iconfont__svg__cssinject__ = !0; + if (a && !c.__iconfont__svg__cssinject__) { + c.__iconfont__svg__cssinject__ = !0; try { document.write( "" ); - } catch (e) { - console && console.log(e); + } catch (c) { + console && console.log(c); } } + function o() { + i || ((i = !0), h()); + } function m() { - o || ((o = !0), l()); - } - function d() { try { - n.documentElement.doScroll("left"); - } catch (e) { - return void setTimeout(d, 50); + e.documentElement.doScroll("left"); + } catch (c) { + return void setTimeout(m, 50); } - m(); + o(); } - (t = function () { - var e, t; - ((t = document.createElement("div")).innerHTML = i), - (i = null), - (e = t.getElementsByTagName("svg")[0]) && - (e.setAttribute("aria-hidden", "true"), - (e.style.position = "absolute"), - (e.style.width = 0), - (e.style.height = 0), - (e.style.overflow = "hidden"), - (t = e), - (e = document.body).firstChild ? a(t, e.firstChild) : e.appendChild(t)); + (l = function () { + var c, l; + ((l = document.createElement("div")).innerHTML = v), + (v = null), + (c = l.getElementsByTagName("svg")[0]) && + (c.setAttribute("aria-hidden", "true"), + (c.style.position = "absolute"), + (c.style.width = 0), + (c.style.height = 0), + (c.style.overflow = "hidden"), + (l = c), + (c = document.body).firstChild ? n(l, c.firstChild) : c.appendChild(l)); }), document.addEventListener ? ~["complete", "loaded", "interactive"].indexOf(document.readyState) - ? setTimeout(t, 0) - : ((c = function () { - document.removeEventListener("DOMContentLoaded", c, !1), t(); + ? setTimeout(l, 0) + : ((t = function () { + document.removeEventListener("DOMContentLoaded", t, !1), l(); }), - document.addEventListener("DOMContentLoaded", c, !1)) + document.addEventListener("DOMContentLoaded", t, !1)) : document.attachEvent && - ((l = t), - (n = e.document), - (o = !1), - d(), - (n.onreadystatechange = function () { - "complete" == n.readyState && ((n.onreadystatechange = null), m()); + ((h = l), + (e = c.document), + (i = !1), + m(), + (e.onreadystatechange = function () { + "complete" == e.readyState && ((e.onreadystatechange = null), o()); })); })(window); diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index 1ffacc048..41cc71c99 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -5,6 +5,27 @@ "css_prefix_text": "team-icon", "description": "pure-admin", "glyphs": [ + { + "icon_id": "2508809", + "name": "最新连载", + "font_class": "zuixinlianzai", + "unicode": "e6da", + "unicode_decimal": 59098 + }, + { + "icon_id": "7795613", + "name": "新品", + "font_class": "xinpin", + "unicode": "e614", + "unicode_decimal": 58900 + }, + { + "icon_id": "7795615", + "name": "新品人气王", + "font_class": "xinpinrenqiwang", + "unicode": "e615", + "unicode_decimal": 58901 + }, { "icon_id": "18367956", "name": "中英文2 中文", diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index 501d8efba..6b5008325 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index cba3fbd19..00ee66dbe 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index ac2bf6429..d9fa6c0c5 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/components/ReIcon/index.ts b/src/components/ReIcon/index.ts new file mode 100644 index 000000000..441416bed --- /dev/null +++ b/src/components/ReIcon/index.ts @@ -0,0 +1,12 @@ +import { App } from "vue"; +import icon from "./src/Icon.vue"; + +export const Icon = Object.assign(icon, { + install(app: App) { + app.component(icon.name, icon); + } +}); + +export default { + Icon +}; diff --git a/src/components/ReIcon/src/Icon.vue b/src/components/ReIcon/src/Icon.vue new file mode 100644 index 000000000..f0836a134 --- /dev/null +++ b/src/components/ReIcon/src/Icon.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue index 8ea61af7c..5c2bb3e37 100644 --- a/src/layout/components/sidebar/sidebarItem.vue +++ b/src/layout/components/sidebar/sidebarItem.vue @@ -1,6 +1,7 @@