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 | 91 ++++++++++++++++++++++++++++++++-------------
1 files changed, 64 insertions(+), 27 deletions(-)
diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index e15117d..0e243c4 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -1,13 +1,4 @@
-<!--
- * @Author : yuan
- * @Date : 2025-10-14 17:40:58
- * @LastEditors : yuan
- * @LastEditTime : 2025-10-20 09:21:34
- * @FilePath : \src\pages\map\index.vue
- * @Description :
- * Copyright 2025 OBKoro1, All Rights Reserved.
- * 2025-10-14 17:40:58
--->
+
<template>
<view class="page-wrap">
<WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage" />
@@ -17,36 +8,82 @@
<script setup>
import { getWebViewUrl } from "@/utils/index.js";
import WebViewPlus from "@/components/WebViewPlus.vue";
+import { onHide, onShow } from "@dcloudio/uni-app";
+import {getUserInfo} from "@/api/user/index.js";
-const viewUrl = getWebViewUrl("/defaultMap");
+let envParam = "";
+// #ifdef WEB
+envParam = "true";
+// #endif
+// #ifdef APP-PLUS
+envParam = "false";
+// #endif
+
+const updateKey = ref(0);
+const viewUrl = computed(() => {
+ return getWebViewUrl("/defaultMap", {
+ isWeb: envParam,
+ updateKey: updateKey.value,
+ });
+});
+
const onPostMessage = (data) => {
+ // #ifdef MP-WEIXIN
+ if (data.type === "scanCode") {
+ } else if (data.type === "jumpAddWork") {
+ } else if (data.type === "jumpMapNav") {
+ //事件导航
+ } else if (data.type === "workid") {
+ //事件详情
+ }
+ // #endif
+ // #ifndef MP-WEIXIN
if (data.type === "scanCode") {
uni.navigateTo({
url: "/subPackages/qrCode/index",
});
- }else if(data.type === "jumpAddWork"){//新建工单
- uni.switchTab({
- url: "/subPackages/taskDetail/addTask/index",
- });
+ } else if (data.type === "jumpAddWork") {
+ //新建任务
+ const encodedData = encodeURIComponent(JSON.stringify(data.rowItem));
+ uni.setStorageSync("webview_params", encodedData);
+ uni.switchTab({
+ url: `/subPackages/taskDetail/addTask/index`,
+ });
+ } else if (data.type === "jumpMapNav") {
+ //事件导航
+ uni.navigateTo({
+ url: `/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`,
+ });
+ } else if (data.type === "workid") {
+ //事件详情
+ uni.navigateTo({
+ url: `/subPackages/workDetail/index?eventNum=${data.eventNum}`,
+ });
}
- else if(data.type === 'jumpMapNav'){ //事件导航
- uni.navigateTo({
- url:`/subPackages/workDetail/mapWork/index?currentItem=${data.eventNum}`
- });
- } else if(data.type === 'workid'){ //事件详情
- uni.navigateTo({
- url:`/subPackages/workDetail/index?eventNum=${data.eventNum}`
- });
- }
+ // #endif
};
-onShow(()=>{
+onShow(() => {
+ // 验证一下有没有登录
+ getUserInfo()
+
+ // #ifndef MP-WEIXIN
uni.setTabBarItem({
index: 2, // Tab 的索引（从0开始）
visible: false,
- })
-})
+ pagePath: "subPackages/taskDetail/addTask/index",
+ });
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: true,
+ });
+ // #endif
+});
+
+onHide(() => {
+ updateKey.value = updateKey.value + 1;
+});
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3