From 1f184dc68712ff34495cdf6b2d0da64cbf5e5783 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 17 Jan 2022 17:23:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/pcLayout/index.vue             |    2 +-
 src/pcviews/specialmap/welcome.vue |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pcLayout/index.vue b/src/pcLayout/index.vue
index b2212d5..5e57722 100644
--- a/src/pcLayout/index.vue
+++ b/src/pcLayout/index.vue
@@ -58,7 +58,7 @@
 
                     <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/celebrate">社区庆</el-menu-item> -->
                         <el-menu-item index="/pcLayout/default/specialmap/welcome">社区迎新</el-menu-item>
                     </el-submenu>
 
diff --git a/src/pcviews/specialmap/welcome.vue b/src/pcviews/specialmap/welcome.vue
index 3401bda..e10e975 100644
--- a/src/pcviews/specialmap/welcome.vue
+++ b/src/pcviews/specialmap/welcome.vue
@@ -3,7 +3,7 @@
  * @Name: 社区迎新
  * @Date: 2021-11-15 17:14:47
  * @Last Modified by: Morpheus
- * @Last Modified time: 2022-01-14 17:22:55
+ * @Last Modified time: 2022-01-17 11:25:32
  */
 <template>
     <div>
@@ -252,6 +252,7 @@
             this.panoramaShow = true
         }
     }
+
 }
 </script>
 

--
Gitblit v1.9.3