From 994f590af529c1ffc6dca6fcd88e7aa0f62eb367 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 14 Jan 2022 17:31:41 +0800
Subject: [PATCH] 改冲突
---
src/store/getters.js | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 706feae..8e9568c 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -22,24 +22,15 @@
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, //当前选择路径
+ 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 // 当前选择路径
+ showActivity: (state) => state.mobile.showActivity, // 显影活动弹窗
+ isOpenDrawALineMany: (state) => state.mobile.isOpenDrawALineMany // 显影活动弹窗
}
->>>>>>> acb45c731c3ccd0a67061efb4e7bdf4f56005672
const navigation = {
campusNavFlag: (state) => state.navigation.campusNavFlag,
--
Gitblit v1.9.3