diff --git a/public/favicon.ico b/public/favicon.ico index a5e7769ea..bef93d4b0 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css index ab907c1a1..09ee98714 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=1634903299890") format("woff2"), - url("iconfont.woff?t=1634903299890") format("woff"), - url("iconfont.ttf?t=1634903299890") format("truetype"); + src: url("iconfont.woff2?t=1636197082361") format("woff2"), + url("iconfont.woff?t=1636197082361") format("woff"), + url("iconfont.ttf?t=1636197082361") format("truetype"); } .iconfont { @@ -13,24 +13,8 @@ -moz-osx-font-smoothing: grayscale; } -.team-iconshuifei::before { - content: "\e62d"; -} - -.team-iconshuiyuandi::before { - content: "\e64e"; -} - -.team-iconshuifei1::before { - content: "\e616"; -} - -.team-iconshui::before { - content: "\e61f"; -} - -.team-iconzuixinlianzai::before { - content: "\e6da"; +.team-iconlogo::before { + content: "\e620"; } .team-iconxinpin::before { @@ -41,22 +25,6 @@ content: "\e615"; } -.team-iconinternationality::before { - content: "\e67a"; -} - -.team-iconshanchu::before { - content: "\e617"; -} - -.team-iconshow-main-container::before { - content: "\e878"; -} - -.team-iconhidden-main-container::before { - content: "\e881"; -} - .team-iconexit-fullscreen::before { content: "\e62a"; } diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js index 060827419..e180203e7 100644 --- a/src/assets/iconfont/iconfont.js +++ b/src/assets/iconfont/iconfont.js @@ -1,18 +1,18 @@ !(function (c) { var l, t, - h, + e, i, a, - e = - '', - v = (v = document.getElementsByTagName("script"))[ - v.length - 1 + n = + '', + h = (h = document.getElementsByTagName("script"))[ + h.length - 1 ].getAttribute("data-injectcss"), o = function (c, l) { l.parentNode.insertBefore(c, l); }; - if (v && !c.__iconfont__svg__cssinject__) { + if (h && !c.__iconfont__svg__cssinject__) { c.__iconfont__svg__cssinject__ = !0; try { document.write( @@ -22,21 +22,21 @@ console && console.log(c); } } - function n() { - a || ((a = !0), h()); + function d() { + a || ((a = !0), e()); } - function m() { + function v() { try { i.documentElement.doScroll("left"); } catch (c) { - return void setTimeout(m, 50); + return void setTimeout(v, 50); } - n(); + d(); } (l = function () { var c, l; - ((l = document.createElement("div")).innerHTML = e), - (e = null), + ((l = document.createElement("div")).innerHTML = n), + (n = null), (c = l.getElementsByTagName("svg")[0]) && (c.setAttribute("aria-hidden", "true"), (c.style.position = "absolute"), @@ -54,11 +54,11 @@ }), document.addEventListener("DOMContentLoaded", t, !1)) : document.attachEvent && - ((h = l), + ((e = l), (i = c.document), (a = !1), - m(), + v(), (i.onreadystatechange = function () { - "complete" == i.readyState && ((i.onreadystatechange = null), n()); + "complete" == i.readyState && ((i.onreadystatechange = null), d()); })); })(window); diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json index f62633ec9..58756c7f9 100644 --- a/src/assets/iconfont/iconfont.json +++ b/src/assets/iconfont/iconfont.json @@ -6,39 +6,11 @@ "description": "pure-admin", "glyphs": [ { - "icon_id": "1715043", - "name": "水费", - "font_class": "shuifei", - "unicode": "e62d", - "unicode_decimal": 58925 - }, - { - "icon_id": "7873366", - "name": "水源地", - "font_class": "shuiyuandi", - "unicode": "e64e", - "unicode_decimal": 58958 - }, - { - "icon_id": "12257150", - "name": "水费", - "font_class": "shuifei1", - "unicode": "e616", - "unicode_decimal": 58902 - }, - { - "icon_id": "24810949", - "name": "水", - "font_class": "shui", - "unicode": "e61f", - "unicode_decimal": 58911 - }, - { - "icon_id": "2508809", - "name": "最新连载", - "font_class": "zuixinlianzai", - "unicode": "e6da", - "unicode_decimal": 59098 + "icon_id": "22129506", + "name": "水能", + "font_class": "logo", + "unicode": "e620", + "unicode_decimal": 58912 }, { "icon_id": "7795613", @@ -54,34 +26,6 @@ "unicode": "e615", "unicode_decimal": 58901 }, - { - "icon_id": "18367956", - "name": "中英文2 中文", - "font_class": "internationality", - "unicode": "e67a", - "unicode_decimal": 59002 - }, - { - "icon_id": "6184565", - "name": "删除", - "font_class": "shanchu", - "unicode": "e617", - "unicode_decimal": 58903 - }, - { - "icon_id": "9626913", - "name": "全屏", - "font_class": "show-main-container", - "unicode": "e878", - "unicode_decimal": 59512 - }, - { - "icon_id": "9626952", - "name": "退出全屏", - "font_class": "hidden-main-container", - "unicode": "e881", - "unicode_decimal": 59521 - }, { "icon_id": "5698509", "name": "全屏缩小", diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index 119830a59..3155199d8 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 49c5ae833..50f07dfe1 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 e8fdfaebf..c8449476f 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/assets/login/avatar.svg b/src/assets/login/avatar.svg new file mode 100644 index 000000000..453efaae6 --- /dev/null +++ b/src/assets/login/avatar.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/bg.png b/src/assets/login/bg.png new file mode 100644 index 000000000..8cdd3001f Binary files /dev/null and b/src/assets/login/bg.png differ diff --git a/src/assets/login/illustration0.svg b/src/assets/login/illustration0.svg new file mode 100644 index 000000000..9450d229e --- /dev/null +++ b/src/assets/login/illustration0.svg @@ -0,0 +1 @@ +special_event \ No newline at end of file diff --git a/src/assets/login/illustration1.svg b/src/assets/login/illustration1.svg new file mode 100644 index 000000000..f3fe3dbe1 --- /dev/null +++ b/src/assets/login/illustration1.svg @@ -0,0 +1 @@ +air support \ No newline at end of file diff --git a/src/assets/login/illustration2.svg b/src/assets/login/illustration2.svg new file mode 100644 index 000000000..356568970 --- /dev/null +++ b/src/assets/login/illustration2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration3.svg b/src/assets/login/illustration3.svg new file mode 100644 index 000000000..e0ad86742 --- /dev/null +++ b/src/assets/login/illustration3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration4.svg b/src/assets/login/illustration4.svg new file mode 100644 index 000000000..ee125143c --- /dev/null +++ b/src/assets/login/illustration4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration5.svg b/src/assets/login/illustration5.svg new file mode 100644 index 000000000..101a14df8 --- /dev/null +++ b/src/assets/login/illustration5.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/login/illustration6.svg b/src/assets/login/illustration6.svg new file mode 100644 index 000000000..d63eea3c2 --- /dev/null +++ b/src/assets/login/illustration6.svg @@ -0,0 +1 @@ +working_out \ No newline at end of file diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue index 2eca28004..c2ac579ce 100644 --- a/src/layout/components/sidebar/horizontal.vue +++ b/src/layout/components/sidebar/horizontal.vue @@ -118,7 +118,7 @@ onMounted(() => {