From ea3796f9a0098858f5726e03db56a339b6eab3cc Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 21 五月 2024 09:13:19 +0800
Subject: [PATCH] Merge branch 'master' into dev-threejs

---
 src/router/index.js |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index f244038..eeb0275 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,7 +64,7 @@
   {
     path: '',
     component: Layout,
-    redirect: 'index',
+    redirect: 'screen',
     children: [
       {
         path: 'index',
@@ -74,13 +74,24 @@
       }
     ]
   },
+
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: 'index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/index'),
+  //       name: 'Index',
+  //       meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/screen',
-    component: Layout,
     hidden: true,
     component: () => import('@/views/screen/index'),
-    name: 'Profile',
-    meta: { title: '澶у睆淇℃伅', icon: 'user' }
   },
   {
     path: '/user',

--
Gitblit v1.8.0