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;