From 8e04df4a9b64199a84bcae5b7c5b3bebf34a5390 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 16 Oct 2025 09:21:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/map/index.vue | 65 +++++++-------------------------
1 files changed, 15 insertions(+), 50 deletions(-)
diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index d16b73d..3a80b85 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -1,66 +1,31 @@
+<!--
+ * @Author : yuan
+ * @Date : 2025-10-14 17:40:58
+ * @LastEditors : yuan
+ * @LastEditTime : 2025-10-15 15:54:25
+ * @FilePath : \src\pages\map\index.vue
+ * @Description :
+ * Copyright 2025 OBKoro1, All Rights Reserved.
+ * 2025-10-14 17:40:58
+-->
<template>
<view class="page-wrap">
- <web-view
- ref="sWebViewRef"
- :src="`${viewUrl}`"
- @message="onPostMessage"
- @onPostMessage="onPostMessage"
- />
+ <WebViewPlus :src="`${viewUrl}`" @webMessage="onPostMessage" />
</view>
</template>
<script setup>
import { useUserStore } from "@/store/index.js";
+import WebViewPlus from "@/components/WebViewPlus.vue";
-const sWebViewRef = ref(null);
const userStore = useUserStore();
-const viewUrl = `https://192.168.1.194:5174/drone-app-web-view/#/webViewWrapper/defaultMap?params=${JSON.stringify(
+const viewUrl = `http://192.168.1.194:5174/drone-app-web-view/#/webViewWrapper/defaultMap?params=${JSON.stringify(
userStore?.userInfo
)}`;
-const onPostMessage = (event) => {
- // #ifdef APP-PLUS
- if (event.detail.data[0].type === "scanCode") {
- scanCode();
- }
- // #endif
-};
+const onPostMessage = (event) => {};
-const scanCode = () => {
- // 只允许通过相机扫码
- uni.scanCode({
- onlyFromCamera: true,
- success: function (res) {
- console.log("条码类型：" + res.scanType);
- console.log("条码内容：" + res.result);
-
- // 获取扫码结果
- let url = res.result;
-
- // 跳转到B页面，并传递URL参数
- uni.navigateTo({
- url: "/subPackages/browser/index?url=" + encodeURIComponent(url),
- });
- },
- fail: function (err) {
- console.log("扫码失败：", err);
- uni.showToast({
- title: "扫码失败",
- icon: "none",
- });
- },
- });
-};
-
-onLoad(() => {
- // #ifdef H5
- window.addEventListener("message", function (e) {
- if (e.data.data.type === "scanCode") {
- scanCode();
- }
- });
- // #endif
-});
+onLoad(() => {});
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3