冲突

liuyg

2021-12-31 5c7c3cc18ce38ec6897808d63359cf774b958a30

 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