From 86ad3a11043f11ad68ec5ffb733906dd5309bf15 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 28 Feb 2024 22:47:53 +0800
Subject: [PATCH] add

---
 src/App.vue                | 71 +++++++++++++++++++++++---------------
 src/components/areaMap.vue |  4 ---
 src/view/index.vue         |  5 +--
 3 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 217a88c..e0cb8c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,50 @@
 <script setup >
 
- 
+
 // let Token =localStorage.getItem('TOKEN')
 import { globalEventBus } from '@/common/eventBus'
 import { Push } from '@/common/push'
 import { areaObj } from "@/store/index.js"
 import { useRouter } from 'vue-router';
-const router=useRouter()
-const userInfoStore=areaObj()
+const router = useRouter()
+const userInfoStore = areaObj()
 userInfoStore.changeUserInfoFn(510521)
 
 
-const openPush=(uid=11)=>{
+// 获取 URL 中的查询参数部分
+var queryString = window.location.hash.split("?")[1];
+// 解析查询参数字符串
+const searchParamsType = new URLSearchParams(queryString);
+// 读取名为 id 的参数
+const type = searchParamsType.get('type') || '';
+if (type) { localStorage.setItem("TRADE_TYPE", true) }
+else {
+  localStorage.setItem("TRADE_TYPE", false)
+}
+const isMainScreen = Boolean(type)
+console.log(isMainScreen, 'isMainScreen')
+
+const openPush = (uid = 11) => {
+  if (isMainScreen) return
   var connection = new Push({
-  url: 'wss://chat.lihaink.cn/tts', // websocket地址
-  app_key: 'aaea61749929eb53a4bd75a1474c1d27',
-});
-// 假设用户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' );
+    url: 'wss://chat.lihaink.cn/tts', // websocket地址
+    app_key: 'aaea61749929eb53a4bd75a1474c1d27',
+  });
+  // 假设用户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,'收到事件')
+  // 当user-2频道有message事件的消息时
+  user_channel.on('message', function (data) {
+    console.log(data, '收到事件')
     globalEventBus.emit(data.content.event, data.content.data)
-});
-// 断线事件
-user_channel.on('close', function () {
+  });
+  // 断线事件
+  user_channel.on('close', function () {
 
-});
+  });
 }
 
 globalEventBus.on('refresh', data => {
@@ -47,19 +61,22 @@ const searchParams = new URLSearchParams(queryString);
 
 // 读取名为 id 的参数
 const id = searchParams.get('local') || '';
-if (!JSON.parse(localStorage.getItem("TRADE_TYPE"))) {
-  if (id) {
-    openPush(id);
 
-  }
-  else {
-    openPush();
-  }
-}
+id ? openPush(id) : openPush()
+
+// if (!JSON.parse(localStorage.getItem("TRADE_TYPE"))) {
+//   if (id) {
+//     openPush(id);
+
+//   }
+//   else {
+//     openPush();
+//   }
+// }
 
 </script>
 <template>
-    <router-view></router-view>
+  <router-view></router-view>
   <div>
   </div>
 </template>
diff --git a/src/components/areaMap.vue b/src/components/areaMap.vue
index f06caf3..2c76f2f 100644
--- a/src/components/areaMap.vue
+++ b/src/components/areaMap.vue
@@ -316,9 +316,6 @@ const initAreaMap = async () => {
   bg.setOption(option);
   bg.on('click', function (params) {
 
-    console.log(params, 'parmas')
-
-
     if (isMainScreen) {
       sendFn('choseTown', { name: params?.name||params?.value })
     } else {
@@ -563,7 +560,6 @@ const initTownMap = async (name) => {
 }
 
 watch(() => areaStore.userInfo, (value, oldValue) => {
-  console.log("监听到了", value)
   if (!value.streetCode) {
     initGeoJson(value.areaCode)
     getFamrCenter().then(res => {
diff --git a/src/view/index.vue b/src/view/index.vue
index 36e7e98..89ff2ea 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -11,10 +11,7 @@
 import {  useRoute } from "vue-router"
 const route = useRoute()
 import Header from "@/components/Header.vue"
-if (route.query?.type) { localStorage.setItem("TRADE_TYPE", true) }
-else {
-    localStorage.setItem("TRADE_TYPE", false)
-}
+
 
 </script>
 <style lang="scss">