From 93ebc4b35259e9d8c3a34d4b206f2e053d46d043 Mon Sep 17 00:00:00 2001
From: chyuanrufeng <chyuanrufeng@devide>
Date: Mon, 20 Nov 2023 13:55:04 +0800
Subject: [PATCH] Auto Commit

---
 src/App.vue                 | 17 +++++++++++++++--
 src/components/HomeView.vue |  4 +++-
 src/main.js                 |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a88ca0a..1fb9868 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,11 +4,24 @@
 </script>
 
 <template>
-<RouterLink to="/">Home</RouterLink>
-<RouterLink to="/tablemerge">tablemerge合并单元格</RouterLink>
+    <header>
+        <RouterLink class="routeClass" to="/">Home </RouterLink>
+        <RouterLink class="routeClass" to="/tablemerge">tablemerge合并单元格</RouterLink>
+
+
+    </header>
+    <main>
+        <RouterView />
+    </main>
+
 
 </template>
 
 <style scoped>
 
+.routeClass
+{
+    margin: 10px;
+}
+
 </style>
diff --git a/src/components/HomeView.vue b/src/components/HomeView.vue
index c11e72c..1f32f71 100644
--- a/src/components/HomeView.vue
+++ b/src/components/HomeView.vue
@@ -2,9 +2,11 @@
 defineProps({
   msg: {
     type: String,
-    required: true
+    required: true,
   }
 })
+
+
 </script>
 
 <template>
diff --git a/src/main.js b/src/main.js
index c000ebb..cdb8ab2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,7 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'  //支持中文
 import router from './router'
 
 
-import './assets/main.css'
+//import './assets/main.css'
 import 'element-plus/dist/index.css'
 
 const app = createApp(App);
-- 
GitLab