From 278bc557c5381c32a6a13bd014ffd119d55e6d6e Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 13 Nov 2025 14:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/map/index.vue | 110 +++++++++++++++++++++++++++++-------------------------
1 files changed, 59 insertions(+), 51 deletions(-)
diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index bc580e6..b259c22 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -1,61 +1,69 @@
-<!--
- * @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" />
- </view>
+ <view class="page-wrap">
+ <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage" />
+ </view>
</template>
<script setup>
-import { getWebViewUrl } from "@/utils/index.js";
-import WebViewPlus from "@/components/WebViewPlus.vue";
+ import {
+ getWebViewUrl
+ } from "@/utils/index.js";
+ import WebViewPlus from "@/components/WebViewPlus.vue";
+ // const viewUrl = getWebViewUrl("/defaultMap");
+ const baseUrl = getWebViewUrl("/defaultMap");
-const viewUrl = getWebViewUrl("/defaultMap");
-const onPostMessage = (data) => {
+ let envParam = "";
+ // #ifdef WEB
+ envParam = "isWeb=true";
+ // #endif
+ // #ifdef APP-PLUS
+ envParam = "isWeb=false";
+ // #endif
+ const viewUrl = ref("");
+ onMounted(() => {
+ if (typeof baseUrl === "string") {
+ viewUrl.value = baseUrl.includes("?") ?
+ `${baseUrl}&${envParam}` :
+ `${baseUrl}?${envParam}`;
+ }
+ });
+ const onPostMessage = (data) => {
+ if (data.type === "scanCode") {
+ uni.navigateTo({
+ url: "/subPackages/qrCode/index",
+ });
+ } else if (data.type === "jumpAddWork") { //新建任务
+ console.log(data.rowItem, '9999')
+ 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}`
+ });
+ }
+ };
- if (data.type === "scanCode") {
- uni.navigateTo({
- url: "/subPackages/qrCode/index",
- });
- } else if(data.type === "jumpAddWork"){//新建任务
- const encodedData = encodeURIComponent(JSON.stringify(data.rowItem))
- uni.setStorageSync('webview_params', encodedData)
- uni.navigateTo({
- 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}`
- });
- }
-};
-
-onShow(()=>{
- uni.setTabBarItem({
- index: 2, // Tab 的索引（从0开始）
- visible: false,
- })
- uni.setTabBarItem({
- index: 3, // Tab
- visible: true,
- });
-})
+ onShow(() => {
+ uni.setTabBarItem({
+ index: 2, // Tab 的索引（从0开始）
+ visible: false,
+ })
+ uni.setTabBarItem({
+ index: 3, // Tab
+ visible: true,
+ });
+ })
</script>
<style scoped lang="scss">
-.page-wrap {
- font-size: 20px;
-}
+ .page-wrap {
+ font-size: 20px;
+ }
</style>
--
Gitblit v1.9.3