From 722dbde665a8e335bccaa9d984cd02eb22333e54 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Sat, 05 Mar 2022 17:49:13 +0800
Subject: [PATCH] +新增标签,可编辑,可加图片

---
 src/store/modules/popupParams.js |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/popupParams.js b/src/store/modules/popupParams.js
index 218580c..edbfa68 100644
--- a/src/store/modules/popupParams.js
+++ b/src/store/modules/popupParams.js
@@ -1,5 +1,7 @@
+import leftNavsData from './pc/leftNavsData'
 const popupParams = {
     state: {
+        ...leftNavsData.state,
         popupBgUrl: null,
         pupupQRUrl: null,
         terminus: null,
@@ -30,8 +32,13 @@
         closeMapClick: false, //关闭地图点击,防止新增标签误触
     },
     mutations: {
+        ...leftNavsData.mutations,
         SET_POPUPBGURL(state, popupBgUrl) {
-            state.popupBgUrl = popupBgUrl
+            // console.log(popupBgUrl, "see33333")
+            if (!popupBgUrl) {
+                return;
+            }
+            state.popupBgUrl = popupBgUrl;
         },
         SET_POPUPQRURL(state, pupupQRUrl) {
             state.pupupQRUrl = pupupQRUrl
@@ -127,6 +134,7 @@
         }
     },
     actions: {
+        ...leftNavsData.actions,
         openPopups({
             state,
             commit,
@@ -173,8 +181,12 @@
             commit("SET_STATENAME", value.item.mechanismname);
             commit("SET_PANORAMAURL", value.item.panoramaurl);
             commit("SET_INTRODUCETEXT", value.item.introduce);
-            var imgArr = value.item.tpurl.split(",");
+            var imgArr = [];
+            if (value.item.tpurl) {
+                imgArr = value.item.tpurl.split(",");
+            }
             commit("SET_POPUPBGURL", imgArr[0]);
+            commit('SET_POPUPIMGATLAS', imgArr)
             commit("SET_POPUPQRURL", value.item.codeurl);
             commit("SET_POINTPOSITION", [
                 Number(value.lng),
@@ -184,7 +196,6 @@
                 Number(-90),
                 Number(0),
             ]);
-            commit('SET_POPUPIMGATLAS', imgArr)
             commit("SET_DETAILSPOPUP", true);
         },
         pcMoveView({

--
Gitblit v1.9.3