From f86cb647ca0ae91519216af19c1ec876874ffb81 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期三, 26 十月 2022 11:24:33 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master
---
src/views/layout/components/Main/index.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/views/layout/components/Main/index.vue b/src/views/layout/components/Main/index.vue
index e7674a4..1bf7ce1 100644
--- a/src/views/layout/components/Main/index.vue
+++ b/src/views/layout/components/Main/index.vue
@@ -1,15 +1,31 @@
<template>
<el-main>
- <router-view></router-view>
+ <!-- <NavBar /> -->
+ <div class="content">
+ <router-view></router-view>
+ <!-- 搴曢儴鍖哄煙 -->
+ <!-- <MyFooter/> -->
+ </div>
</el-main>
</template>
<script>
-// import NavBar from "../NavBar"
+// import MyFooter from "../Footer"
+import NavBar from "../NavBar"
export default {
name: "Main",
- components:{
- // NavBar
+ components: {
+ // MyFooter,
+ NavBar
}
};
-</script>
\ No newline at end of file
+</script>
+<style lang="scss">
+.el-main {
+ min-width: 1024px;
+ padding: 0;
+ .content {
+ padding: 11px;
+ }
+}
+</style>
--
Gitblit v1.8.0