From 9c50a6a7cf6f40af955672f7b38950aa61a5484f Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 25 Dec 2021 09:32:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/getters.js | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 00099e1..b7da4e7 100644
--- a/src/store/getters.js
+++ b/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,
--
Gitblit v1.9.3