Merge remote-tracking branch 'origin/master'

src/main.js

@@ -1,4 +1,5 @@
 import { createApp } from 'vue'
+import './assets/css/style.css'
 import App from './App.vue'
 import 'normalize.css';
 import router from './router';

src/router/index.js

@@ -3,11 +3,11 @@ import { createRouter, createWebHistory } from 'vue-router';
 const routes = [
     {
         path: '/',
-        redirect: 'layout'
+        redirect: 'home'
     },
     {
-        path: '/layout',
-        name: 'layout',
+        path: '/home',
+        name: 'home',
         component: () => import('@/views/layout.vue'),
         children: [
             {
@@ -23,8 +23,54 @@ const routes = [
         component: () => import('@/views/layout.vue'),
         children: [
             {
-                path: '/about1',
-                name: 'about1',
+                path: 'statutes',
+                name: 'statutes',
+                meta: { title: '首页' },
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'council',
+                name: 'council',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'seniormanagement',
+                name: 'seniormanagement',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'academiccommittee',
+                name: 'academiccommittee',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'supervisoryauthority',
+                name: 'supervisoryauthority',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'developmentplanning',
+                name: 'developmentplanning',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'annualworkplan',
+                name: 'annualworkplan',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'statutes',
+                name: 'statutes',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'statutes',
+                name: 'statutes',
+                component: () => import('@/views/about/index.vue')
+            },
+            {
+                path: 'statutes',
+                name: 'statutes',
                 component: () => import('@/views/about/index.vue')
             },
         ]

src/views/layout.vue

@@ -4,9 +4,10 @@
        class="100vw">
     <div style="height:80px;background:#000;"
          class="color-white row items-center">
-      <div class="col-4 ">延庆博物馆</div>
+      <div class="col-4 row items-center justify-center"><img src="../assets/images/icon-title.png"
+             style="width:40px;height:40px" /><span class="fl-ml-sm">延庆博物馆</span></div>
 
-      <div class="col-6  row justify-around items-center">
+      <div class="col-6 row justify-around items-center">
 
         <div class="cursor header-title">首页</div>
         <div class="cursor header-title">导航</div>