From ae038d50b068a02c4fe53725095dc952bf75b797 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Dec 2021 17:36:21 +0800
Subject: [PATCH] 冲突
---
src/store/getters.js | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index a7e07d6..dbf262b 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,9 +1,17 @@
-const getters = {
- viewer: state => state.viewer.viewer,
- popupBgUrl: state => state.popupParams.popupBgUrl,
- pupupQRUrl: state => state.popupParams.pupupQRUrl,
+//手机端
+let mobile = {
mviewer: state => state.mobile.mviewer,
mBigPopup: state => state.mobile.mBigPopup,
mBigPopupAfter: state => state.mobile.mBigPopupAfter
}
+const getters = {
+ ...mobile,
+ viewer: state => state.viewer.viewer,
+ popupBgUrl: state => state.popupParams.popupBgUrl,
+ pupupQRUrl: state => state.popupParams.pupupQRUrl,
+ pointPosition: state => state.popupParams.pointPosition,
+ terminus: state => state.popupParams.terminus,
+ startingPoint: state => state.popupParams.startingPoint,
+ stateName: state => state.popupParams.stateName,
+}
export default getters
--
Gitblit v1.9.3