From 4bb7014c00b3e6cca7bf049808dfedf418c020c2 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 12 十月 2024 14:21:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/router/index.js |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index f492054..b62dc2c 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -3,7 +3,6 @@
 // import User from '../views/sys/User.vue'
 // import Role from '../views/sys/Role.vue'
 // import Menu from '../views/sys/Menu.vue'
-
 const router = createRouter({
   history: createWebHashHistory(),
   routes: [
@@ -17,6 +16,11 @@
       path: '/login',
       name: 'login',
       component: () => import('../views/LoginView.vue')
+    },
+    {
+      path: '/new-page', // 鏂板鐨勬棤闇�鐧诲綍鐨勯〉闈�  
+      name: 'newPage',  
+      component: () => import('../views/NewPage.vue')
     },
     {
       path: '/main',
@@ -68,13 +72,18 @@
         /*----------- 涓婄墖鏈� ----------------*/
       {
         path: 'Returns',
-        name: 'Returns',
-        component: () => import('../views/Returns/returns.vue'),
+        name: 'return',
+        component: () => import('../views/Returns/return.vue'),
         children:[
           {
             path: '/Returns/returns',
             name: 'returns',
             component: () => import('../views/Returns/returns.vue')
+          },
+          {
+            path: '/Returns/upreturns',
+            name: 'upreturns',
+            component: () => import('../views/Returns/upreturns.vue')
           },
         ]
       },
@@ -302,7 +311,7 @@
         },
         {
           path: '',
-          redirect: '/returns/returns'
+          redirect: '/Returns/returns'
         }
       ]
     },
@@ -315,4 +324,13 @@
   ]
 })
 
+// 瀵艰埅瀹堝崼  
+router.beforeEach((to, from, next) => {  
+  const isAuthenticated = !!localStorage.getItem('authToken'); // 鍋囪杩欐槸浣犵殑鐧诲綍鐘舵�佹鏌ラ�昏緫  
+  if (to.matched.some(record => record.meta.requiresAuth) && !isAuthenticated) {  
+    next({ name: 'login' }); // 濡傛灉闇�瑕佺櫥褰曚絾鏈櫥褰曪紝鍒欓噸瀹氬悜鍒扮櫥褰曢〉闈�  
+  } else {  
+    next(); // 鍚﹀垯缁х画瀵艰埅  
+  }  
+}); 
 export default router

--
Gitblit v1.8.0