From 5c7c3cc18ce38ec6897808d63359cf774b958a30 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:05:59 +0800
Subject: [PATCH] 冲突
---
src/store/getters.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index df7ad6d..e951b6c 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -30,7 +30,10 @@
const search = {
orgNavBarFlag: state => state.search.orgNavBarFlag,
orgNavBarTitle: state => state.search.orgNavBarTitle,
- orgNavBarList: state => state.search.orgNavBarList
+ orgNavBarList: state => state.search.orgNavBarList,
+ arcNavBarFlag: state => state.search.arcNavBarFlag,
+ arcNavBarTitle: state => state.search.arcNavBarTitle,
+ arcNavBarCode: state => state.search.arcNavBarCode
}
const getters = {
@@ -48,8 +51,10 @@
telephone: state => state.popupParams.telephone,
introduceText: state => state.popupParams.introduceText,
panoramaUrl: state => state.popupParams.panoramaUrl,
- detailsPopup: state => state.popupParams.detailsPopup,
panoramaPopup: state => state.popupParams.panoramaPopup,
+ monitorUrl: state => state.popupParams.monitorUrl,
+ monitorPopup: state => state.popupParams.monitorPopup,
+ detailsPopup: state => state.popupParams.detailsPopup,
popupImgAtlas: state => state.popupParams.popupImgAtlas,
teachList: state => state.popupParams.teachList,
liveList: state => state.popupParams.liveList
--
Gitblit v1.9.3