error message

src/router/index.js

@@ -2,8 +2,8 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 import EditNote from "@/views/EditNote.vue";
 import ViewNote from "@/views/ViewNote.vue";
-import ErrorView from "@/views/ErrorView.vue";
-import InvalidateNote from "@/views/InvalidateNote.vue";
+import ErrorRoute from "@/views/ErrorRoute.vue";
+import ErrorNote from "@/views/ErrorNote.vue";
 import { getKeyMeta, getNoteMeta } from "@/api/note";
 import { getStoreKey } from "@/api/lock";
 import storage from "@/libs/storage";
@@ -27,7 +27,7 @@ function getErrorMetaParam() {
 }
 
 function getNoteView() {
-  if(errorMeta){
+  if (errorMeta) {
     return;
   }
 
@@ -42,7 +42,7 @@ function getNoteView() {
   let regKey = /^[abcdefhikmnopqstuvwxyz23456789]{16}$/;
   if (!regKey.test(key)) {
     errorMeta = 100002;
-    return InvalidateNote;
+    return ErrorNote;
   }
 
   if (keyMeta && keyMeta.key) {
@@ -56,13 +56,13 @@ function getNoteView() {
   //server error
   if (!noteMeta) {
     errorMeta = 100006;
-    return InvalidateNote;
+    return ErrorNote;
   }
 
   //invalidated key
   if (!noteMeta.key) {
     errorMeta = 100002;
-    return InvalidateNote;
+    return ErrorNote;
   }
 
   //validated state
@@ -77,10 +77,10 @@ function getNoteView() {
     // user deleted
     if (noteMeta.ttl > 0) {
       errorMeta = 100003;
-      return InvalidateNote;
+      return ErrorNote;
     } else {// timeout
       errorMeta = 100004;
-      return InvalidateNote;
+      return ErrorNote;
     }
   }
 
@@ -94,17 +94,17 @@ function getNoteView() {
       let df = storage.session.getText(storeKey + "_delete")
       if (df) {//unsubmitted,user deleted.
         errorMeta = 100003;
-        return InvalidateNote;
+        return ErrorNote;
       } else {//unsubmitted
         errorMeta = 100005;
-        return InvalidateNote;
+        return ErrorNote;
       }
     }
   }
 
   // other exception
   errorMeta = 100001;
-  return InvalidateNote;
+  return ErrorNote;
 }
 
 function getHomeRedirect() {
@@ -119,7 +119,7 @@ function getHomeRedirect() {
   // server error
   if (!keyMeta) {
     errorMeta = 100006;
-    return "/invalidatenote";
+    return "/error_"+errorMeta;
   }
 
   return "/" + keyMeta.key;
@@ -131,14 +131,14 @@ const routes = [
     name: "home",
     redirect: getHomeRedirect(),
   },
-  { path: "/invalidatenote", component: InvalidateNote },
+  { path: "/error_:code([0-9]{6})", component: ErrorNote },
   {
     path: "/:name([a-z0-9]{1,20})",
     name: "note",
     component: getNoteView(),
     meta: { keyMeta: getKeyMetaParam(), noteMeta: getNoteMetaParam(), errorMeta: getErrorMetaParam() },
   },
-  { path: "/:path(.*)", component: ErrorView }
+  { path: "/:path(.*)", component: ErrorRoute }
 ];
 
 const router = new VueRouter({