From 44dd9c4eb8a2489c63a5eb53fd4254bbb3510e95 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 18 Jun 2026 09:14:57 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.4'

---
 src/pages/map/index.vue |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index 8771ccd..0e243c4 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -1,13 +1,4 @@
-<!--
- * @Author       : yuan
- * @Date         : 2025-12-03 14:20:57
- * @LastEditors  : yuan
- * @LastEditTime : 2025-12-19 15:32:31
- * @FilePath     : \src\pages\map\index.vue
- * @Description  :
- * Copyright 2025 OBKoro1, All Rights Reserved.
- * 2025-12-03 14:20:57
--->
+
 <template>
   <view class="page-wrap">
     <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage" />
@@ -18,7 +9,7 @@
 import { getWebViewUrl } from "@/utils/index.js";
 import WebViewPlus from "@/components/WebViewPlus.vue";
 import { onHide, onShow } from "@dcloudio/uni-app";
-// const viewUrl = getWebViewUrl("/defaultMap");
+import {getUserInfo} from "@/api/user/index.js";
 
 let envParam = "";
 // #ifdef WEB
@@ -56,7 +47,7 @@
     //新建任务
     const encodedData = encodeURIComponent(JSON.stringify(data.rowItem));
     uni.setStorageSync("webview_params", encodedData);
-    uni.navigateTo({
+    uni.switchTab({
       url: `/subPackages/taskDetail/addTask/index`,
     });
   } else if (data.type === "jumpMapNav") {
@@ -74,13 +65,20 @@
 };
 
 onShow(() => {
-  uni.setStorageSync("lastTab", "map");
+  // 验证一下有没有登录
+  getUserInfo()
+
+  // #ifndef MP-WEIXIN
   uni.setTabBarItem({
-    index: 2,
-    text: "",
-    iconPath: "static/images/tabbar/drone.png",
-    selectedIconPath: "static/images/tabbar/drone.png",
+    index: 2, // Tab 的索引(从0开始)
+    visible: false,
+    pagePath: "subPackages/taskDetail/addTask/index",
   });
+  uni.setTabBarItem({
+    index: 3, // Tab
+    visible: true,
+  });
+  // #endif
 });
 
 onHide(() => {

--
Gitblit v1.9.3