diff --git a/public/index.html b/public/index.html
index a506b0c..01361c0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,266 +1,293 @@
-
-
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index f88437d..da16aea 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -118,5 +118,6 @@
color: #069f99;
overflow: hidden;
word-break: keep-all;
+ white-space: nowrap;
text-overflow: ellipsis;
}
\ No newline at end of file
diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue
index 1452577..1adb73f 100644
--- a/src/components/page/GlobalLayout.vue
+++ b/src/components/page/GlobalLayout.vue
@@ -191,7 +191,7 @@ body {
}
.layout {
- min-height: 100vh !important;
+ min-height: calc(100vh - 10px) !important;
overflow-x: hidden;
&.mobile {
diff --git a/src/utils/device.js b/src/utils/device.js
index 6bf15fc..09e893e 100644
--- a/src/utils/device.js
+++ b/src/utils/device.js
@@ -16,8 +16,9 @@ const enquireScreen = function (call) {
call && call(1)
}
}
- enquireJs.register('screen and (max-width: 1087.99px)', handler)
- enquireJs.register('screen and (max-width: 767.99px)', handler2)
+ // 将max-width设为0,防止转换为手机模式,将菜单隐藏至左侧
+ enquireJs.register('screen and (max-width: 0px)', handler)
+ enquireJs.register('screen and (max-width: 0px)', handler2)
}
export default enquireScreen
\ No newline at end of file