From 3d3620b81b9c2ae8e8f41ef542f0e5fa8ae43c00 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 06 三月 2025 10:53:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/layouts/AppLayout.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index d4c0be8..857b53a 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -1,7 +1,7 @@
<template>
<div>
<CommonHeader />
- <div style="height:10px; background: #fff"></div>
+ <!-- <div style="height:10px; background: #fff"></div> -->
<el-container class="app-layout">
<el-aside :class="{collapse:menuData.collapse}">
<Menu/>
@@ -10,7 +10,6 @@
<header>
<AppHeader/>
</header>
- <div style="height:10px;"></div>
<main ref="containerS">
<transition name="fade">
<!-- <keep-alive>-->
@@ -69,8 +68,8 @@
height: calc(100vh - 80px);
overflow-y: scroll;
overflow-x: hidden;
- background: $primary-color;
- color: #fff;
+ background: #fff;
+ color: #333333;
transition: width ease .3s;
scrollbar-width: none; /* firefox */
-ms-overflow-style: none; /* IE 10+ */
@@ -104,7 +103,7 @@
& > main {
height: 100%;
box-sizing: border-box;
- overflow-y: auto;
+ /* overflow-y: auto; */
}
}
}
--
Gitblit v1.9.3