From d491b887d4bec8bf8ac26bd7e1ae52ce1f63fae3 Mon Sep 17 00:00:00 2001 From: ronger Date: Mon, 21 Sep 2020 15:05:10 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=94=A8=E6=88=B7=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/layouts/mobile/header.vue | 2 +- components/layouts/mobile/main.vue | 7 ++----- components/layouts/pc/header.vue | 4 ++-- components/layouts/pc/main.vue | 10 ++++------ 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/components/layouts/mobile/header.vue b/components/layouts/mobile/header.vue index aa824d1..9be06fc 100644 --- a/components/layouts/mobile/header.vue +++ b/components/layouts/mobile/header.vue @@ -165,7 +165,7 @@ default: _ts.$router.push( { - name: item + path: '/' } ) } diff --git a/components/layouts/mobile/main.vue b/components/layouts/mobile/main.vue index ffa7946..38fe9f2 100644 --- a/components/layouts/mobile/main.vue +++ b/components/layouts/mobile/main.vue @@ -40,17 +40,14 @@ .el-main { padding: 20px 0; background-attachment: fixed; - min-height: 280px; - margin-bottom: 6rem; + min-height: 87.5vh; overflow-x: hidden; } .el-footer { - position: fixed; - bottom: 0; + position: relative; width: 100%; padding-top: 1rem; - padding-bottom: 1rem; background: #fff; border-top: 1px solid rgba(0, 40, 100, 0.12); z-index: 80; diff --git a/components/layouts/pc/header.vue b/components/layouts/pc/header.vue index efaa4e5..8e0cda7 100644 --- a/components/layouts/pc/header.vue +++ b/components/layouts/pc/header.vue @@ -14,7 +14,7 @@ 首页 专题 开源代码 - 资料下载 + @@ -180,7 +180,7 @@ default: _ts.$router.push( { - name: item + path: '/' } ) } diff --git a/components/layouts/pc/main.vue b/components/layouts/pc/main.vue index 8e5c25a..20b12ac 100644 --- a/components/layouts/pc/main.vue +++ b/components/layouts/pc/main.vue @@ -92,17 +92,15 @@ .el-main { padding: 20px 0; background-attachment: fixed; - min-height: 280px; - margin-bottom: 60px; + min-height: 87.5vh; overflow-x: hidden; } .el-footer { - position: fixed; - bottom: 0; + position: relative; + /*bottom: 0;*/ width: 100%; - padding-top: 1rem; - padding-bottom: 1rem; + padding-top: 1.2rem; background: #fff; border-top: 1px solid rgba(0, 40, 100, 0.12); z-index: 80;