From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突
---
src/components/map/index.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 8c895c0..80ce431 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -31,6 +31,7 @@
<campusNav ref="campusNavRoute"
v-show="campusNavFlag" />
+ <search-details v-if="searchPopupFlag"></search-details>
<org-nav-bar v-if="orgNavBarFlag"></org-nav-bar>
<arc-nav-bar v-if="arcNavBarFlag"></arc-nav-bar>
</div>
@@ -82,7 +83,8 @@
// 社区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
- 'arcNavBarFlag'
+ 'arcNavBarFlag',
+ 'searchPopupFlag'
])
},
mounted () {
--
Gitblit v1.9.3