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/pcLayout/index.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index b392b48..039de1a 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -56,7 +56,11 @@
<el-menu-item index="/pcLayout/default/campusnavi"> <i class='custom-icon menu-xydh'></i> 社区导航</el-menu-item>
- <el-menu-item index="/pcLayout/default/specialmap"> <i class='custom-icon menu-ztdt'></i> 专题地图</el-menu-item>
+ <!-- <el-submenu index="specialmap">
+ <template slot="title"> <i class='custom-icon menu-ztdt'></i> 专题地图</template>
+ <el-menu-item index="/pcLayout/default/specialmap/celebrate">社区庆</el-menu-item>
+ <el-menu-item index="/pcLayout/default/specialmap/welcome">社区迎新</el-menu-item>
+ </el-submenu> -->
<el-submenu index="tool">
<template slot="title"> <i class='custom-icon menu-tool'></i> 工具</template>
--
Gitblit v1.9.3