Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/Header.vue

components.d.ts

@@ -26,6 +26,7 @@ declare module 'vue' {
     ElMain: typeof import('element-plus/es')['ElMain']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElRate: typeof import('element-plus/es')['ElRate']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']
@@ -34,6 +35,7 @@ declare module 'vue' {
     Footer: typeof import('./src/components/Footer.vue')['default']
     Header: typeof import('./src/components/Header.vue')['default']
     Login: typeof import('./src/components/Login.vue')['default']
+    NotFound: typeof import('./src/components/NotFound.vue')['default']
     Register: typeof import('./src/components/Register.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']

src/components/Header.vue

@@ -29,6 +29,7 @@ function logout() {
 function search() {
   //todo: search
 
+
 }
 
 </script>
@@ -49,6 +50,7 @@ function search() {
 
       </el-col>
 
+
       <el-col :span="1" class="header-icon">
         <router-link to="/manager/createStore" v-slot="{navigate}">
           <el-icon @click="navigate" :size="35" color="white" ><CirclePlus /></el-icon>

src/components/NotFound.vue

@@ -0,0 +1,21 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+  <el-result
+      icon="error"
+      title="错误"
+      sub-title="您访问的页面不存在"
+    >
+    <template #extra>
+      <router-link to="/home">
+        <el-button type="primary">回到主页</el-button>
+      </router-link>
+    </template>
+  </el-result>
+</template>
+
+<style scoped>
+
+</style>

src/router/index.ts

@@ -92,7 +92,15 @@ const router = createRouter({
                 }
             },
         ]
-    }]
+    },
+        {
+            path: '/404',
+            name: '404',
+            component: () => import('../components/NotFound.vue'),
+            meta: {
+                title: '404'
+            }
+        }]
 })
 
 router.beforeEach((to, from, next) => {
@@ -105,7 +113,7 @@ router.beforeEach((to, from, next) => {
                 next();
             }
             else {
-                next('/allStore');
+                next('/404');
             }
         } else {
             next()