From eecadc9f4fc4f067dba0221125bacb180ce3b0e2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 14 Jan 2022 17:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/store/getters.js | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 9f54707..706feae 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -22,12 +22,24 @@
perspectiveControl: (state) => state.mobile.perspectiveControl, /// 视角控制：高度、角度 ()=>{}
audioState: (state) => state.mobile.audioState, // 文字转语音状态
+<<<<<<< HEAD
+ isOpenDrawALine: (state) => state.mobile.isOpenDrawALine, //是否开启路线
+ isendPosition: (state) => state.mobile.isendPosition, //路线导航终点数据改变
+ endPosition: (state) => state.mobile.endPosition, //路线导航终点数据
+ routerS: (state) => state.mobile.routerS, //所有路径
+ choiceRouterS: (state) => state.mobile.choiceRouterS, //当前选择路径
+
+ showActivity: (state) => state.mobile.showActivity, //显影活动弹窗
+ isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany, //显影活动弹窗
+};
+=======
isOpenDrawALine: (state) => state.mobile.isOpenDrawALine, // 是否开启路线
isendPosition: (state) => state.mobile.isendPosition, // 路线导航终点数据改变
endPosition: (state) => state.mobile.endPosition, // 路线导航终点数据
routerS: (state) => state.mobile.routerS, // 所有路径
choiceRouterS: (state) => state.mobile.choiceRouterS // 当前选择路径
}
+>>>>>>> acb45c731c3ccd0a67061efb4e7bdf4f56005672
const navigation = {
campusNavFlag: (state) => state.navigation.campusNavFlag,
--
Gitblit v1.9.3