From 117dc4cec546f830bc941ea314dcbdb9b370b211 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 25 Jan 2022 14:43:11 +0800
Subject: [PATCH] 冲突

---
 src/store/modules/search.js |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/store/modules/search.js b/src/store/modules/search.js
index dead091..68ecb03 100644
--- a/src/store/modules/search.js
+++ b/src/store/modules/search.js
@@ -3,9 +3,13 @@
         orgNavBarFlag: false,
         orgNavBarTitle: [],
         orgNavBarList: [],
+
         arcNavBarFlag: false,
         arcNavBarTitle: [],
-        arcNavBarCode: []
+        arcNavBarCode: [],
+
+        searchPopupFlag: false,
+        searchPopupList: []
     },
     mutations: {
         SET_ORGNAVBARFLAG (state, orgNavBarFlag) {
@@ -26,7 +30,15 @@
         },
         SET_ARCNAVBARCODE (state, arcNavBarCode) {
             state.arcNavBarCode = arcNavBarCode
+        },
+
+        SET_SEARCHPOPUPFLAG (state, searchPopupFlag) {
+            state.searchPopupFlag = searchPopupFlag
+        },
+        SET_SEARCHPOPUPLIST (state, searchPopupList) {
+            state.searchPopupList = searchPopupList
         }
+
     },
     actions: {
 

--
Gitblit v1.9.3