From f8d436a1a0c1d0ed4884966af283a143d618a479 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 2 Feb 2024 23:42:01 +0800
Subject: [PATCH] add

---
 src/components/areaList.vue | 6 +++++-
 src/components/areaMap.vue  | 8 ++------
 src/view/detail.vue         | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/areaList.vue b/src/components/areaList.vue
index f376c2c..6ea446f 100644
--- a/src/components/areaList.vue
+++ b/src/components/areaList.vue
@@ -1,6 +1,6 @@
 <template>
     <Transition>
-        <div class="address">
+        <div class="address" v-if="isMainScreen">
             <div class="address-li" @click="choseTownFn({ name: '泸县', code: 510521, isArea: true })"> 泸县</div>
             <div class="address-li" @click="choseTownFn(item)" v-for="( item, index ) in areaList ">{{ item.name }}</div>
         </div>
@@ -13,6 +13,9 @@ import { reactive } from "vue"
 import axios from "axios"
 import { areaObj } from "@/store/index.js"
 import { sendMsg } from "@/api.js"
+import { useRouter } from "vue-router"
+const router=useRouter()
+
 const sendFn = (event, data = '') => {
     sendMsg({ channel: 'user-11', event, data })
 }
@@ -32,6 +35,7 @@ const choseTownFn = (item) => {
         item.code == 510521? sendFn('choserArea', { name: item.name, code: item.code }):  sendFn('choseTown', { name: item.name })
 
     } else {
+        router.push('/')
         item.code == 510521 ? userInfoStore.changeUserInfoFn(510521, '', item.name) : userInfoStore.changeUserInfoFn(510521, Number(item.code), item.name)
     }
 
diff --git a/src/components/areaMap.vue b/src/components/areaMap.vue
index 447fe00..f79fb63 100644
--- a/src/components/areaMap.vue
+++ b/src/components/areaMap.vue
@@ -309,8 +309,6 @@ const initAreaMap =async () => {
 
 }
 const initTownMap = async (name) => {
-
-  console.log("首位到访的")
   showArea.value = false
   await nextTick()
   let center = []
@@ -530,7 +528,7 @@ const initTownMap = async (name) => {
     })
     params.data.data.forEach(item => {
       if (item.value[0] == longInfo[0] && item.value[1] == longInfo[1]) {
-        router.replace(`/detail?landId=${item.id}&town=${name}&parmas=${JSON.stringify(areaStore.userInfo)}&landName=${item.name}`)
+        router.push(`/detail?landId=${item.id}&town=${name}&parmas=${JSON.stringify(areaStore.userInfo)}&landName=${item.name}`)
       }
 
     })
@@ -539,15 +537,13 @@ const initTownMap = async (name) => {
 
 watch(() => areaStore.userInfo, (value, oldValue) => {
   value.name == '泸县' ? initAreaMap() : initTownMap(value.name)
-  console.log(showArea.value,"fdjfdoijf")
-
 }, {
   deep: true,
 }
 
 )
 onMounted(async () => {
-  await nextTick()
+  if(areaStore.userInfo.streetCode)return;
   setTimeout(() => {showArea.value? initAreaMap(): initTownMap() }, 500)
 })
 
diff --git a/src/view/detail.vue b/src/view/detail.vue
index d144e8c..2b4d0ee 100644
--- a/src/view/detail.vue
+++ b/src/view/detail.vue
@@ -125,11 +125,11 @@ globalEventBus.on('backHome', data => {
 
 })
 globalEventBus.on('choserArea', data => {
-    router.go(-1)
+    router.push("/")
   areaStore.changeUserInfoFn(data.code, '', data.name)
 })
 globalEventBus.on('choseTown', data => {
-    router.go(-1)
+    router.push("/")
   areaStore.areaCodeList.forEach(item => {
     if (item.name == (data.name)) {
       areaStore.changeUserInfoFn(areaStore.userInfo.areaCode, item.code, data.name)