From baa9153168df800fa567b66a94e3969ce9bef1f9 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 07 Jan 2022 10:31:17 +0800
Subject: [PATCH] 冲突
---
src/router/page/index.js | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/router/page/index.js b/src/router/page/index.js
index d224cfe..1bc006f 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-04-30 14:12:09
* @Last Modified by: Morpheus
- * @Last Modified time: 2021-12-22 10:17:37
+ * @Last Modified time: 2022-01-05 14:04:28
*/
import Vue from 'vue'
@@ -241,7 +241,22 @@
component: resolve => require(['../../pcviews/specialmap/index.vue'], resolve),
meta: {
title: '专题地图'
- }
+ },
+ children: [{
+ path: 'celebrate',
+ component: resolve => require(['../../pcviews/specialmap/celebrate.vue'], resolve),
+ meta: {
+ title: '社区庆'
+ }
+ },
+ {
+ path: 'welcome',
+ component: resolve => require(['../../pcviews/specialmap/welcome.vue'], resolve),
+ meta: {
+ title: '社区迎新'
+ }
+ }
+ ]
},
{
path: 'tool',
--
Gitblit v1.9.3