From 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Dec 2021 13:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/store/getters.js |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/store/getters.js b/src/store/getters.js
index bae0997..932cd75 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -2,15 +2,18 @@
 const mobile = {
     mviewer: state => state.mobile.mviewer,
     mBigPopup: state => state.mobile.mBigPopup,
+    popupOurOpenData: state => state.mobile.popupOurOpenData,
+    popupTableName: state => state.mobile.popupTableName,
     mBigPopupAfter: state => state.mobile.mBigPopupAfter,
     iconHide: state => state.mobile.iconHide,
-    DC: state => state.mobile.DC,
-    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,
-    openmobilePanorama: state => state.mobile.openmobilePanorama
+    openmobilePanorama: state => state.mobile.openmobilePanorama,
+    MobileWindowsHideFixed: state => state.mobile.MobileWindowsHideFixed,//固定窗口
+    MobileWindowChangeDataFixed: state => state.mobile.MobileWindowChangeDataFixed,//固定窗口
 }
 const getters = {
     ...mobile,
@@ -22,9 +25,13 @@
     startingPoint: state => state.popupParams.startingPoint,
     stateName: state => state.popupParams.stateName,
     siteName: state => state.popupParams.siteName,
+    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
+    panoramaPopup: state => state.popupParams.panoramaPopup,
+    popupImgAtlas: state => state.popupParams.popupImgAtlas,
+    teachList: state => state.popupParams.teachList,
+    liveList: state => state.popupParams.liveList
 }
 export default getters

--
Gitblit v1.9.3