From b642a20e0cc04ae0b7b1a803439411f49fe0b576 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 15 Oct 2025 09:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/map/index.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/pages/map/index.vue b/src/pages/map/index.vue
index c5e9f0e..d16b73d 100644
--- a/src/pages/map/index.vue
+++ b/src/pages/map/index.vue
@@ -1,6 +1,11 @@
<template>
<view class="page-wrap">
- <web-view ref="sWebViewRef" :src="`${viewUrl}`" />
+ <web-view
+ ref="sWebViewRef"
+ :src="`${viewUrl}`"
+ @message="onPostMessage"
+ @onPostMessage="onPostMessage"
+ />
</view>
</template>
@@ -9,9 +14,52 @@
const sWebViewRef = ref(null);
const userStore = useUserStore();
-const viewUrl = `http://192.168.1.194:5174/drone-app-web-view/#/webViewWrapper/defaultMap?params=${JSON.stringify(userStore?.userInfo)}`;
+const viewUrl = `https://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 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
});
</script>
--
Gitblit v1.9.3