处理冲突

This commit is contained in:
2020-09-27 17:07:13 +08:00
15 changed files with 837 additions and 13 deletions

View File

@@ -1,4 +1,6 @@
import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
import Home from '../views/Home.vue'
import Login from "../views/login/Login.vue"
const routes: Array<RouteRecordRaw> = [
{
@@ -29,12 +31,14 @@ const routes: Array<RouteRecordRaw> = [
component: () => import(/* webpackChunkName: "about" */ '../components/NavTop.vue')
},
{
path: '/about',
name: 'About',
// route level code-splitting
// this generates a separate chunk (about.[hash].js) for this route
// which is lazy-loaded when the route is visited.
component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
path: '/login',
name: 'Login',
component:Login
},
{
path: '/sign',
name: 'Sign',
component: () => import('../views/login/Sign.vue')
},
]