From b30158b7d9d33812bafe300ed1b172a628933842 Mon Sep 17 00:00:00 2001
From: duanshuwen <duanshuwen@gogpay.cn>
Date: Mon, 1 Jun 2026 20:10:02 +0800
Subject: [PATCH] refactor(discovery): use vue router instead of uni nav

also reorder imports for better organization, clean up commented legacy code, fix comment formatting from triple slash to double slash, and remove unused getLocation logic
---
 src/pages/home/components/Discovery/index.vue | 78 +++++++------------
 1 file changed, 29 insertions(+), 49 deletions(-)

diff --git a/src/pages/home/components/Discovery/index.vue b/src/pages/home/components/Discovery/index.vue
index 75ad7a6..706b03c 100644
--- a/src/pages/home/components/Discovery/index.vue
+++ b/src/pages/home/components/Discovery/index.vue
@@ -16,21 +16,21 @@
 <script setup>
 import { onMounted, ref } from "vue";
 import { emitter } from '@/utils/events'
+import { useRouter } from "vue-router";
 import { SEND_MESSAGE_CONTENT_TEXT, SEND_MESSAGE_COMMAND_TYPE, SWITCH_TO_COMPANION_TAB } from "@/constants/constant";
-// import { navigateTo } from "@/router";
 import { getAccessToken } from "@/constants/token";
+import { homeTabsData, getNearbyTags, homeTabContentData, homeQuickQuestionData } from "@/api/home";
+import { useAppStore, useLocationStore } from "@/store";
+import { JumpType } from "@/constants/ChatModel";
 
 import FindTabs from "./components/FindTabs/index.vue";
 import CardSwiper from "./components/CardSwiper/index.vue";
 import QuickQuestions from "./components/QuickQuestions/index.vue";
 
-import { homeTabsData, getNearbyTags, homeTabContentData, homeQuickQuestionData } from "@/api/home";
-import { useAppStore, useLocationStore } from "@/store";
-import { JumpType } from "@/constants/ChatModel";
-
+const router = useRouter()
 const appStore = useAppStore();
 const locationStore = useLocationStore();
-/// 从个渠道获取如二维码
+// 从个渠道获取如二维码
 const sceneId = appStore.sceneId || "";
 
 const activeIndex = ref(0);
@@ -47,32 +47,32 @@ const emitScrollTouch = () => {
   emit("scroll-touch");
 };
 
-/// tabs 切换事件
+// tabs 切换事件
 const handleTabChange = ({ tab, idx }) => {
   activeIndex.value = idx;
   queryDiscoveryData(tab.id);
 }
 
-/// 请求发现页tab数据
+// 请求发现页tab数据
 const queryTabsList = async () => {
   const res = await homeTabsData();
   if (res.code === 0) {
-    /// 处理tab数据
+    // 处理tab数据
     const tabList = res.data.map((item) => ({
       id: item.id,
       label: item.tagName,
     }));
-    /// 设置tab数据
+    // 设置tab数据
     discoveryTabs.value = tabList;
-    /// 根据sceneId查询对应tab数据
+    // 根据sceneId查询对应tab数据
     findTabByIdWithActiveTabIndex(sceneId);
   }
 }
-/// 根据id查询tab并设置activeIndex
+// 根据id查询tab并设置activeIndex
 const findTabByIdWithActiveTabIndex = (tabsId) => {
-  /// 查询是否有id参数
+  // 查询是否有id参数
   const activeTabIndex = discoveryTabs.value.findIndex((tab) => tab.id === tabsId);
-  /// 如果有则优先展示对应tab数据，没有则展示第一个tab数据
+  // 如果有则优先展示对应tab数据，没有则展示第一个tab数据
   if (activeTabIndex > -1) {
     activeIndex.value = activeTabIndex;
     queryDiscoveryData(tabsId);
@@ -84,13 +84,13 @@ const findTabByIdWithActiveTabIndex = (tabsId) => {
   }
 }
 
-/// 统一请求发现页数据
+// 统一请求发现页数据
 const queryDiscoveryData = async (tabId) => {
   queryDiscoveryCards(tabId);
   queryQuickQuestionData(tabId);
 };
 
-/// 请求发现页卡片数据
+// 请求发现页卡片数据
 const queryDiscoveryCards = async (tabId) => {
   const res = await homeTabContentData({ tagId: tabId });
   if (res.code === 0) {
@@ -98,7 +98,7 @@ const queryDiscoveryCards = async (tabId) => {
   }
 }
 
-/// 请求快速问题列表数据
+// 请求快速问题列表数据
 const queryQuickQuestionData = async (tabId) => {
   const res = await homeQuickQuestionData({ tagId: tabId });
   if (res.code === 0) {
@@ -106,7 +106,7 @@ const queryQuickQuestionData = async (tabId) => {
   }
 }
 
-/// 统一处理接口返回数据结构
+// 统一处理接口返回数据结构
 const configDataList = (data) => {
   return data.map((item) => ({
     id: item.id,
@@ -121,60 +121,41 @@ const configDataList = (data) => {
   }));
 }
 
-/// 卡片点击事件
+// 卡片点击事件
 const handleCardClick = (item) => {
   handleClick(item);
 };
 
-/// 快速问题点击事件
+// 快速问题点击事件
 const handleQuickQuestionClick = (item) => {
   handleClick(item);
 };
 
 const handleClick = async (item) => {
   console.log(`执行点击事件: ${item.jumpType}，参数：${JSON.stringify(item.jumpContent)}`);
-  /// 商品
+  // 商品
   if (item.jumpType === JumpType.commodity) {
-    uni.navigateTo({
-      url: `/pages/goods/index?commodityId=${item.jumpContent}`,
-    });
+    router.push({ name: 'goods', query: { commodityId: item.jumpContent } })
   }
-  /// 提示词
+
+  // 提示词
   else if (item.jumpType === JumpType.prompt) {
     emitter.emit(SEND_MESSAGE_CONTENT_TEXT, item.jumpContent);
   }
-  /// 链接
+  // 链接
   else if (item.jumpType === JumpType.link) {
     if (item.jumpContent) {
       const token = getAccessToken();
-      // navigateTo(item.jumpContent, { token: token });
+      router.push({ name: item.jumpContent, query: { token: token } })
     }
   }
-  /// 组件指令
+  // 组件指令
   else if (item.jumpType === JumpType.command) {
     emitter.emit(SEND_MESSAGE_COMMAND_TYPE, { type: item.jumpContent, title: item.jumpDesc });
   }
 }
 
-/// 获取位置信息
-const getLocation = () => {
-  /// 已经有sceneId了，说明之前已经获取过位置信息了，就不需要再获取一次了
-  if (sceneId) return;
-  // uni.getLocation({
-  //   type: 'wgs84',
-  //   success: function (res) {
-  //     // 将位置信息存储到 Pinia 中
-  //     locationStore.setLocationData({
-  //       latitude: res.latitude,
-  //       longitude: res.longitude,
-  //     });
-  //     console.log('当前位置：' + JSON.stringify(res));
-  //     getNearbyTagsData();
-  //   }
-  // });
-}
-
-/// 获取附近标签数据
+// 获取附近标签数据
 const getNearbyTagsData = async () => {
   const res = await getNearbyTags();
   if (res.code === 0) {
@@ -183,10 +164,9 @@ const getNearbyTagsData = async () => {
   }
 }
 
-/// 组件挂载后请求数据
+// 组件挂载后请求数据
 onMounted(() => {
   queryTabsList();
-  getLocation();
 });
 
 </script>