From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/router/index.js | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 989b613..a77adb6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,6 +23,11 @@
),
},
{
+ path: "/register/resetPassword",
+ component: () =>
+ import(/* webpackChunkName: "about" */ "../views/register/resetPassword"),
+ },
+ {
path: "/login",
name: "login",
component: () => import(/* webpackChunkName: "about" */ "../views/login"),
@@ -45,9 +50,7 @@
path: "/personalCenter",
name: "personalCenter",
component: () =>
- import(
- /* webpackChunkName: "about" */ "../views/personalCenter"
- ),
+ import(/* webpackChunkName: "about" */ "../views/personalCenter"),
},
{
path: "/equipmentDetail",
@@ -71,6 +74,24 @@
component: () => import(/* webpackChunkName: "about" */ "../views/search"),
},
{
+ path: "/searchOpen",
+ name: "searchOpen",
+ component: () =>
+ import(/* webpackChunkName: "about" */ "../views/search/searchOpen"),
+ },
+ {
+ path: "/GB28181Open",
+ name: "GB28181Open",
+ component: () =>
+ import(/* webpackChunkName: "about" */ "../views/GB28181/GB28181Open"),
+ },
+ {
+ path: "/GB28181",
+ name: "GB28181",
+ component: () =>
+ import(/* webpackChunkName: "about" */ "../views/GB28181/index"),
+ },
+ {
path: "/product",
name: "product",
component: () => import(/* webpackChunkName: "about" */ "../views/product"),
--
Gitblit v1.8.0