From f7d502d1717a9b02a0baab280106e4fa5c0d35d6 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 21 Oct 2021 13:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BA=E5=AE=9A=E4=BA=8E?= =?UTF-8?q?=E4=B8=8A=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 533 ++++++++++++++------------- src/assets/less/common.less | 1 + src/components/page/GlobalLayout.vue | 2 +- src/utils/device.js | 5 +- 4 files changed, 285 insertions(+), 256 deletions(-) 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 @@ - - - - - <%= htmlWebpackPlugin.options.title %> - - - <% if (process.env.NODE_ENV === 'development' ) { %> - - <% } %> - <% if (process.env.NODE_ENV === 'production' ) { %> - - <% } %> - + + + + + <%= htmlWebpackPlugin.options.title %> + + + <% if (process.env.NODE_ENV === 'development' ) { %> + + <% } %> + <% if (process.env.NODE_ENV === 'production' ) { %> + + <% } %> +
-
-
-
-
-
正在加载,请耐心等待 +
+
+
+
+
正在加载,请耐心等待 -
+
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