冲突

liuyg

2021-12-15 ae038d50b068a02c4fe53725095dc952bf75b797

 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