From 6851cc1e217a2af9ae62ebb3bf28e00a0d8ddadb Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 31 Dec 2021 09:06:55 +0800
Subject: [PATCH] +
---
src/store/modules/mobile.js | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/src/store/modules/mobile.js b/src/store/modules/mobile.js
index 62124b5..e77d54a 100644
--- a/src/store/modules/mobile.js
+++ b/src/store/modules/mobile.js
@@ -30,7 +30,6 @@
},
// 默认起始点函数
startPointFn: '',
-<<<<<<< HEAD
dimension: "2.5D",// 维度
dimensionData: {// 维度镜头数据
heading: 0,
@@ -39,10 +38,6 @@
},
perspectiveControl: '',//视角控制：高度、角度 ()=>{}
perspectiveControls: '',//视角控制：高度、角度 ()=>{}
-=======
- dimension: '2D', // 维度
- perspectiveControl: '' // 视角控制：高度、角度 ()=>{}
->>>>>>> 19621635052322005f31579f7f3d481750898d7c
},
mutations: {
MSET_VIEWER(state, viewer) {
--
Gitblit v1.9.3