Merge branch 'refs/heads/main' into styleGet

# Conflicts:
#	src/App.vue
#	src/router/index.js

src/App.vue

@@ -1,38 +1,10 @@
-<script setup>
-import HelloWorld from './components/HelloWorld.vue'
-import authentication from "./views/authentication_login.vue";
-</script>
-
 <template>
-  <div id="app">
   <router-view></router-view>
-  </div>
 </template>
 
-<script>
+<script setup>
-export default {
+import 'element-plus/dist/index.css'
-  name: 'App',
-  computed: {
-    isHelloRoute() {
-      return this.$route.path === '/about'; // 根据实际的路由路径进行判断
-    },
-    isAuthenRoute() {
-      return this.$route.path === '/login'; // 根据实际的路由路径进行判断
-    }
-  }
-};
 </script>
-<!--<style scoped>-->
+
-<!--.logo {-->
+<!--请不要对App.vue进行修改，请采用在views的对应目录下新建自己需要的文件
-<!--  height: 6em;-->
+并通过在/router下的对应模块名称的js中引入路由的方式来显示自己的页面-->
-<!--  padding: 1.5em;-->
-<!--  will-change: filter;-->
-<!--  transition: filter 300ms;-->
-<!--}-->
-<!--.logo:hover {-->
-<!--  filter: drop-shadow(0 0 2em #646cffaa);-->
-<!--}-->
-<!--.logo.vue:hover {-->
-<!--  filter: drop-shadow(0 0 2em #42b883aa);-->
-<!--}-->
-<!--</style>-->

src/components/HelloWorld.vue

@@ -1,17 +1,19 @@
 <script setup>
 import { ref } from 'vue'
-import 'element-plus/dist/index.css'
-
-
-defineProps({
-  msg: String,
-})
 
 const count = ref(0)
 </script>
 
 <template>
-  <h1>{{ msg }}</h1>
+  <div>
+    <a href="https://vitejs.dev" target="_blank">
+      <img src="/vite.svg" class="logo" alt="Vite logo" />
+    </a>
+    <a href="https://vuejs.org/" target="_blank">
+      <img src="../assets/vue.svg" class="logo vue" alt="Vue logo" />
+    </a>
+  </div>
+  <h1>{{ this.$route.meta.msg }}</h1>
 
 
   <div class="card">
@@ -40,6 +42,18 @@ const count = ref(0)
 </template>
 
 <style scoped>
+.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.vue:hover {
+  filter: drop-shadow(0 0 2em #42b883aa);
+}
 .read-the-docs {
   color: #888;
 }

src/router/index.js

@@ -6,9 +6,11 @@ import meetingManagementRoutes from './meetingManagement'
 import newsManagementRoutes from './newsManagement'
 import organizationManagementRoutes from './organizationManagement'
 import userManagementRoutes from './userManagement'
-import authentication from "../views/authentication_login.vue";
+
+// 请不要直接修改本文件，使用在router下的对应模块名称的js中引入路由的方式来代替->
 
 const routes = [
+    { path: '/', component: HelloWorld, meta: {"msg": "HeIl⚪ W0rId!"}},
     ...authenticationRoutes,
     ...courseManagementRoutes,
     ...meetingManagementRoutes,

src/store/index.js

@@ -6,6 +6,8 @@ import newsManagement from './newsManagement'
 import organizationManagement from './organizationManagement'
 import userManagement from './userManagement'
 
+// 请不要直接修改本文件，使用修改/store目录下的对应模块名称的js的方式来代替->
+
 const store = createStore({
     modules: {
         authentication,

src/style.css

@@ -1,79 +1,4 @@
-:root {
+body, html {
-  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-a:hover {
-  color: #535bf2;
-}
-
-body {
     margin: 0;
-  display: flex;
+    padding: 0;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-button:hover {
-  border-color: #646cff;
-}
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-.card {
-  padding: 2em;
-}
-
-#app {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
 }