diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 54fe0e959..ab907c1a1 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=1634092870259") format("woff2"),
- url("iconfont.woff?t=1634092870259") format("woff"),
- url("iconfont.ttf?t=1634092870259") format("truetype");
+ src: url("iconfont.woff2?t=1634903299890") format("woff2"),
+ url("iconfont.woff?t=1634903299890") format("woff"),
+ url("iconfont.ttf?t=1634903299890") format("truetype");
}
.iconfont {
@@ -13,6 +13,22 @@
-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";
}
diff --git a/src/assets/iconfont/iconfont.js b/src/assets/iconfont/iconfont.js
index 8889adf81..060827419 100644
--- a/src/assets/iconfont/iconfont.js
+++ b/src/assets/iconfont/iconfont.js
@@ -2,17 +2,17 @@
var l,
t,
h,
- e,
i,
- v =
- '',
- a = (a = document.getElementsByTagName("script"))[
- a.length - 1
+ a,
+ e =
+ '',
+ v = (v = document.getElementsByTagName("script"))[
+ v.length - 1
].getAttribute("data-injectcss"),
- n = function (c, l) {
+ o = function (c, l) {
l.parentNode.insertBefore(c, l);
};
- if (a && !c.__iconfont__svg__cssinject__) {
+ if (v && !c.__iconfont__svg__cssinject__) {
c.__iconfont__svg__cssinject__ = !0;
try {
document.write(
@@ -22,21 +22,21 @@
console && console.log(c);
}
}
- function o() {
- i || ((i = !0), h());
+ function n() {
+ a || ((a = !0), h());
}
function m() {
try {
- e.documentElement.doScroll("left");
+ i.documentElement.doScroll("left");
} catch (c) {
return void setTimeout(m, 50);
}
- o();
+ n();
}
(l = function () {
var c, l;
- ((l = document.createElement("div")).innerHTML = v),
- (v = null),
+ ((l = document.createElement("div")).innerHTML = e),
+ (e = null),
(c = l.getElementsByTagName("svg")[0]) &&
(c.setAttribute("aria-hidden", "true"),
(c.style.position = "absolute"),
@@ -44,7 +44,7 @@
(c.style.height = 0),
(c.style.overflow = "hidden"),
(l = c),
- (c = document.body).firstChild ? n(l, c.firstChild) : c.appendChild(l));
+ (c = document.body).firstChild ? o(l, c.firstChild) : c.appendChild(l));
}),
document.addEventListener
? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
@@ -55,10 +55,10 @@
document.addEventListener("DOMContentLoaded", t, !1))
: document.attachEvent &&
((h = l),
- (e = c.document),
- (i = !1),
+ (i = c.document),
+ (a = !1),
m(),
- (e.onreadystatechange = function () {
- "complete" == e.readyState && ((e.onreadystatechange = null), o());
+ (i.onreadystatechange = function () {
+ "complete" == i.readyState && ((i.onreadystatechange = null), n());
}));
})(window);
diff --git a/src/assets/iconfont/iconfont.json b/src/assets/iconfont/iconfont.json
index 41cc71c99..f62633ec9 100644
--- a/src/assets/iconfont/iconfont.json
+++ b/src/assets/iconfont/iconfont.json
@@ -5,6 +5,34 @@
"css_prefix_text": "team-icon",
"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": "最新连载",
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index 6b5008325..119830a59 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 00ee66dbe..49c5ae833 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 d9fa6c0c5..e8fdfaebf 100644
Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/sidebar/horizontal.vue
index 4d03b122d..2eca28004 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/sidebar/horizontal.vue
@@ -15,6 +15,7 @@ import { algorithm } from "/@/utils/algorithm";
import screenfull from "../screenfull/index.vue";
import { useRoute, useRouter } from "vue-router";
import { storageSession } from "/@/utils/storage";
+import Icon from "/@/components/ReIcon/src/Icon.vue";
import { deviceDetection } from "/@/utils/deviceDetection";
import globalization from "/@/assets/svg/globalization.svg";
import { usePermissionStoreHook } from "/@/store/modules/permission";
@@ -117,7 +118,7 @@ onMounted(() => {
@@ -39,28 +40,24 @@ const title =
.sidebar-logo-container {
position: relative;
width: 100%;
- height: 50px;
+ height: 48px;
text-align: center;
overflow: hidden;
.sidebar-logo-link {
height: 100%;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ margin-top: 5px;
.sidebar-title {
- display: inline-block;
- margin: 0;
color: #1890ff;
font-weight: 600;
font-size: 20px;
- margin-top: 16px;
+ margin-top: 10px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
}
-
- .fa-optin-monster {
- font-size: 30px;
- color: #1890ff;
- margin-top: 5px;
- }
}
.collapse {
diff --git a/src/style/sidebar.scss b/src/style/sidebar.scss
index fabf4c97e..57ba1b039 100644
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -91,8 +91,10 @@
a {
display: inline-block;
+ display: flex;
+ padding-left: 10px;
+ flex-wrap: wrap;
width: 100%;
- overflow: hidden;
}
.el-menu {
@@ -109,8 +111,6 @@
// menu hover
.submenu-title-noDropdown,
.el-sub-menu__title {
- // background: $menuBg;
-
&:hover {
background-color: $menuHover !important;
}