feat:路由文件添加页面信息

2024-08-30 15:00:42 +08:00
parent b1bfe9529b
commit b5d0ecfdf4
1 changed files with 0 additions and 3 deletions
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,7 +7,6 @@ import local from '../utils/local'
 Vue.use(VueRouter)

 const routes = [
-<<<<<<< HEAD
  {
    path: '/login',
    component: Login,
@@ -97,7 +96,6 @@ const routes = [
      },
    ]
  },
-=======
    {
        path: '/login',
        component: Login,
@@ -160,7 +158,6 @@ const routes = [
            }
        ]
    }
->>>>>>> d14b2f2f812d1e29c7e72c864828024a3008a9a6
 ]

 const router = new VueRouter({