From 694ffa950bf2435affef95272c7bfd6b62704639 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/AppMain.vue | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 3226fb4..f0ae826 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -16,7 +16,7 @@
},
methods: {
childMethod(){
- this.$refs.child.combackLookPlan()
+ this.$refs.child.combackLookPlan()
},
triggerMainBtnPlan(){
this.$parent.triggerCombackBtn()
@@ -34,12 +34,11 @@
<style lang="scss" scoped>
.app-main {
/* 88 = navbar+baredcrumb */
- min-height: calc(100vh - 88px);
+ height: calc(100vh - 88px);
width: 100%;
position: relative;
overflow: hidden;
>div{
- min-height: calc(100vh - 88px);
height: 100%;
width: 100%;
}
--
Gitblit v1.9.3