From f4a9b5ce21e15e31a9ec31f91e91340235a145f7 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Sat, 24 Feb 2024 17:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                |  3 +++
 src/components/areaMap.vue | 38 +++++++++++++++++++++++---------------
 src/view/detail.vue        |  3 ++-
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0fcd973..217a88c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -19,9 +19,12 @@ const openPush=(uid=11)=>{
 // 假设用户uid为1
 // 浏览器监听user-2频道的消息，也就是用户uid为1的用户消息
 var user_channel = connection.subscribe( uid==11?'user-' + uid:uid+'user-plant' );
+// var user_channel = connection.subscribe('zhanguan'+'user-plant' );
+
 
 // 当user-2频道有message事件的消息时
 user_channel.on('message', function (data) {
+  console.log(data,'收到事件')
     globalEventBus.emit(data.content.event, data.content.data)
 });
 // 断线事件
diff --git a/src/components/areaMap.vue b/src/components/areaMap.vue
index 4cb6f7e..e52d667 100644
--- a/src/components/areaMap.vue
+++ b/src/components/areaMap.vue
@@ -42,11 +42,12 @@ import geoJsonJiangyang from "/static/jsonData/jiangyang_geo.js"
 import geoJsonLongmatan from "/static/jsonData/longmatan_geo.js"
 import geoJsonNaxi from "/static/jsonData/naxi_geo.js"
 import geoJsonXuyong from "/static/jsonData/xuyong_geo.js"
-import { useRouter } from "vue-router"
+import { useRouter,useRoute } from "vue-router"
 import { areaObj } from "@/store/index.js"
 import { landListApi } from "@/api.js"
 import { globalEventBus } from '@/common/eventBus'
 import { sendMsg } from "@/api.js"
+const route=useRoute()
 
 const sendFn = (event, data = '') => {
   sendMsg({ channel: 'user-11', event, data })
@@ -62,8 +63,6 @@ const getFamrCenter = async () => {
   return Promise.resolve(farmarCenter);
 }
 
-
-
 const isMainScreen = JSON.parse(localStorage.getItem("TRADE_TYPE"))
 let geoJson = geoJsonLuxian
 const areaStore = areaObj()
@@ -561,10 +560,23 @@ const initTownMap = async (name) => {
 }
 
 watch(() => areaStore.userInfo, (value, oldValue) => {
-
+  console.log("监听到了",value)
   if (!value.streetCode) {
+    initGeoJson(value.areaCode)
+    getFamrCenter().then(res => {
+    initAreaMap()
+    })
+  } else {
+    initTownMap(value.name)
+  }
+}, {
+  deep: true,
+}
 
-    switch (value.areaCode) {
+)
+
+const initGeoJson=(code)=>{
+  switch (code) {
       case "510521":
         geoJson = geoJsonLuxian
         break;
@@ -591,22 +603,18 @@ watch(() => areaStore.userInfo, (value, oldValue) => {
       case '510525':
         geoJson = geoJsonGulin
         break;
-
     }
-    getFamrCenter().then(res => {
-      initAreaMap()
-    })
-  } else {
-    initTownMap(value.name)
-  }
-}, {
-  deep: true,
 }
 
-)
+if(route.query.areaCode){
+  // initGeoJson(areaCode)
+}
+
+
 onMounted(async () => {
   await getFamrCenter()
   if (areaStore.userInfo.streetCode) return;
+  console.log("初始化")
   setTimeout(() => { showArea.value ? initAreaMap() : initTownMap() }, 500)
 })
 
diff --git a/src/view/detail.vue b/src/view/detail.vue
index 8b29cdc..bb23ee3 100644
--- a/src/view/detail.vue
+++ b/src/view/detail.vue
@@ -132,7 +132,8 @@ globalEventBus.on('backHome', data => {
 
 })
 globalEventBus.on('choserArea', data => {
-    router.push("/")
+    // console.log(data.code)
+    router.push("/home?areaCode="+data.code)
   areaStore.changeUserInfoFn(data.code, '', data.name)
 })
 globalEventBus.on('choseTown', data => {