From cfc635a5ca0d9206985869bf62bf72535ee45e14 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 26 Jan 2022 09:30:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/store/getters.js |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/store/getters.js b/src/store/getters.js
index 6846b08..a9348c2 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -31,14 +31,15 @@
   choiceRouterS: (state) => state.mobile.choiceRouterS, // 当前选择路径
 
   showActivity: (state) => state.mobile.showActivity, // 显影活动弹窗
-  isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany // 显影活动弹窗
-}
+  showActivityData: (state) => state.mobile.showActivityData, // 活动弹窗数据
+  isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany, // 显影活动弹窗
+};
 
 const navigation = {
   campusNavFlag: (state) => state.navigation.campusNavFlag,
   comeName: (state) => state.navigation.comeName,
-  getToName: (state) => state.navigation.getToName
-}
+  getToName: (state) => state.navigation.getToName,
+};
 
 const search = {
   orgNavBarFlag: (state) => state.search.orgNavBarFlag,
@@ -48,9 +49,8 @@
   arcNavBarTitle: (state) => state.search.arcNavBarTitle,
   arcNavBarCode: (state) => state.search.arcNavBarCode,
   searchPopupFlag: (state) => state.search.searchPopupFlag,
-  searchPopupList: (state) => state.search.searchPopupList
-
-}
+  searchPopupList: (state) => state.search.searchPopupList,
+};
 
 const getters = {
   ...mobile,
@@ -74,6 +74,6 @@
   detailsPopup: (state) => state.popupParams.detailsPopup,
   popupImgAtlas: (state) => state.popupParams.popupImgAtlas,
   teachList: (state) => state.popupParams.teachList,
-  liveList: (state) => state.popupParams.liveList
-}
-export default getters
+  liveList: (state) => state.popupParams.liveList,
+};
+export default getters;

--
Gitblit v1.9.3