Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2021-12-25 9c50a6a7cf6f40af955672f7b38950aa61a5484f

 src/store/getters.js

@@ -6,18 +6,33 @@
    popupTableName: state => state.mobile.popupTableName,
    mBigPopupAfter: state => state.mobile.mBigPopupAfter,
    iconHide: state => state.mobile.iconHide,
    MobileWindowsHide: state => state.mobile.MobileWindowsHide,//随地图移动窗口
    MobileWindowChangeData: state => state.mobile.MobileWindowChangeData,//随地图移动窗口
    MobileWindowsHide: state => state.mobile.MobileWindowsHide, // 随地图移动窗口
    MobileWindowChangeData: state => state.mobile.MobileWindowChangeData, // 随地图移动窗口
    popupsDom: state => state.mobile.popupsDom,
    query: state => state.mobile.query,
    openmobileGoTo: state => state.mobile.openmobileGoTo,//测试
    ccDataState: state => state.mobile.ccDataState,//测试
    openmobileGoTo: state => state.mobile.openmobileGoTo, // 测试
    ccDataState: state => state.mobile.ccDataState, // 测试
    openmobilePanorama: state => state.mobile.openmobilePanorama,
    MobileWindowsHideFixed: state => state.mobile.MobileWindowsHideFixed,//固定窗口
    MobileWindowChangeDataFixed: state => state.mobile.MobileWindowChangeDataFixed,//固定窗口
    MobileWindowsHideFixed: state => state.mobile.MobileWindowsHideFixed, // 固定窗口
    MobileWindowChangeDataFixed: state => state.mobile.MobileWindowChangeDataFixed // 固定窗口
}

const navigation = {
    campusNavFlag: state => state.navigation.campusNavFlag,
    comeName: state => state.navigation.comeName,
    getToName: state => state.navigation.getToName
}

const search = {
    orgNavBarFlag: state => state.search.orgNavBarFlag,
    orgNavBarTitle: state => state.search.orgNavBarTitle,
    orgNavBarList: state => state.search.orgNavBarList
}

const getters = {
    ...mobile,
    ...navigation,
    ...search,
    viewer: state => state.viewer.viewer,
    popupBgUrl: state => state.popupParams.popupBgUrl,
    pupupQRUrl: state => state.popupParams.pupupQRUrl,