From a63d71177a2899b01da37e5bfc2d498bec5f80be Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 17 十月 2023 15:10:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into zhengwenfeng/modify-style
---
src/components/layout/components/AppMain.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/components/layout/components/AppMain.vue b/src/components/layout/components/AppMain.vue
index 4facd3d..f14d709 100644
--- a/src/components/layout/components/AppMain.vue
+++ b/src/components/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
<template>
<div class="app-main">
<AppHeader :headerTitle="$route.meta.title" />
- <transition>
+ <div class="app-main-content">
<router-view :key="key" />
- </transition>
+ </div>
</div>
</template>
@@ -24,12 +24,17 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.app-main {
- margin-left: 10px;
box-sizing: border-box;
display: flex;
flex: 1;
flex-direction: column;
+ background-color: $color-bg;
// height: 100%;
- width: 100%;
+ width: calc(100% - 200px);
+ .app-main-content {
+ width: 100%;
+ overflow-y: hidden;
+ height: calc(100% - 50px);
+ }
}
</style>
--
Gitblit v1.8.0