From 53217ec58e70cee5016572dff90808350ee57f4c Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 29 Feb 2024 09:24:40 +0800
Subject: [PATCH] add

---
 src/App.vue                        | 29 +++++++++++++++--------------
 src/components/index/topCenter.vue |  1 -
 src/components/index/topLeft.vue   |  1 -
 src/components/index/topRight.vue  |  1 -
 src/view/index.vue                 |  8 ++++----
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2add3a3..07c56e9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,9 +3,23 @@ import { areaObj } from "@/store/index.js"
 import { globalEventBus } from '@/common/eventBus'
 import { Push } from '@/common/push'
 
+// 获取 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 = 10) => {
+  if (isMainScreen) return
+
   var connection = new Push({
     url: 'wss://chat.lihaink.cn/tts', // websocket地址
     app_key: 'aaea61749929eb53a4bd75a1474c1d27',
@@ -64,20 +78,7 @@ const searchParams = new URLSearchParams(queryString);
 
 // 读取名为 id 的参数
 const id = searchParams.get('local') || '';
-console.log(id); // 输出 id 参数的值
-
-
-
-if (!JSON.parse(localStorage.getItem("TRADE_TYPE"))) {
-  if (id) {
-    openPush(id);
-
-  }
-  else {
-    openPush();
-  }
-}
-
+id ? openPush(id) : openPush()
 </script>
 <template>
   <div class="main-box">
diff --git a/src/components/index/topCenter.vue b/src/components/index/topCenter.vue
index 95c4d01..5fc6438 100644
--- a/src/components/index/topCenter.vue
+++ b/src/components/index/topCenter.vue
@@ -160,7 +160,6 @@ onMounted(() => {
     getProductCountApi(props.areaCodes).then(res => {
         data = reactive(res.data)
         clone(res.data, data)
-        console.log(data, 'data')
     })
 
     getViewCountApi(props.areaCodes).then(res => {
diff --git a/src/components/index/topLeft.vue b/src/components/index/topLeft.vue
index aafc109..fe214b5 100644
--- a/src/components/index/topLeft.vue
+++ b/src/components/index/topLeft.vue
@@ -268,7 +268,6 @@ const initStoreOption = (pageData, total) => {
     storeData.splice(0, storeData.length);
     pageData.forEach((item,index) => {
         let range = ((item.merchant_count / total) * 100).toFixed(2)
-        console.log(range,'rean=g')
         storeData.push({
             name: item.street_name,
             num: item.merchant_count,
diff --git a/src/components/index/topRight.vue b/src/components/index/topRight.vue
index c9879cc..51d9487 100644
--- a/src/components/index/topRight.vue
+++ b/src/components/index/topRight.vue
@@ -230,7 +230,6 @@ getSalesRankApi(props.areaCodes).then(res => {
     config.data = addFn(merchantRankingList)
     pageNum.value = Math.ceil(townProductCountList.length / 8)
     initStoreOption(townProductCountList.slice(0, 8), townProductCount.value)
-    console.log(townProductCount.value,'townProductCount')
 })
 const pageFN = (Num) => {
 
diff --git a/src/view/index.vue b/src/view/index.vue
index f447839..e19b810 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -50,10 +50,10 @@ setTimeout(() => {
     showLoading.value = false
 }, 500);
 
-if (route.query?.type) { localStorage.setItem("TRADE_TYPE", true) }
-else {
-    localStorage.setItem("TRADE_TYPE", false)
-}
+// if (route.query?.type) { localStorage.setItem("TRADE_TYPE", true) }
+// else {
+//     localStorage.setItem("TRADE_TYPE", false)
+// }
 </script>
 <style lang="scss">
 @keyframes jump {