Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-14 e000de749a3586717cf990374df135a9dc9cb970

Merge remote-tracking branch 'origin/master'

 applications/mobile-web-view/src/router/page/index.js

@@ -47,7 +47,11 @@
                path: 'defaultMap',
                name: '地图',
                component: () => import('@/appPages/Map/index.vue'),
                meta: { title: '地图'},
                meta: {
                    keepAlive: true,
                    isTab: false,
                    isAuth: false,
                },
            },
            {
                path: 'QrCodeScanner',
@@ -108,7 +112,11 @@
                path: 'voiceCallDetail',
                name: '语音通话',
                component: () => import('@/appPages/voiceCallDetail/index.vue'),
                meta: { title: '语音通话'},
                meta: {
                    keepAlive: true,
                    isTab: false,
                    isAuth: false,
                },
            },
        ],
    },

 uniapps/work-app/src/config/env.js

@@ -13,7 +13,7 @@
  VITE_APP_ENV:'development',
  // 开发环境这里改为自己的
  VITE_APP_WEBVIEW_URL: 'https://wrj.shuixiongit.com/drone-app-web-view/#/webViewWrapper',
  // VITE_APP_WEBVIEW_URL: 'http://192.168.1.157:5176/mobile-web-view/#/webViewWrapper',
  // VITE_APP_WEBVIEW_URL: 'https://192.168.1.157:5176/mobile-web-view/#/webViewWrapper',
  VITE_API_BASE_URL: 'http://218.202.104.82:8200',
  // VITE_API_BASE_URL: 'https://aisky.org.cn/api',
  VITE_APP_WS_API_URL:'wss://wrj.shuixiongit.com/drone-wss/api/v1/ws',

 uniapps/work-app/src/pages.json

@@ -63,6 +63,13 @@
          }
        },
        {
          "path": "voiceCallDetail/index",
          "style": {
            "navigationBarTitleText": "通话详情"

          }
        },
        {
          "path": "workDetail/mapWork/index",
          "style": {
            "navigationBarTitleText": "工单位置"

 uniapps/work-app/src/pages/map/index.vue

@@ -17,7 +17,8 @@
<script setup>
import { getWebViewUrl } from "@/utils/index.js";
import WebViewPlus from "@/components/WebViewPlus.vue";
import { onHide, onShow } from "@dcloudio/uni-app";
import { onHide, onShow,  } from "@dcloudio/uni-app";
import { useUserStore } from "@/store/index.js";
// const viewUrl = getWebViewUrl("/defaultMap");

let envParam = "";
@@ -28,7 +29,13 @@
envParam = "false";
// #endif

const userStore = useUserStore();
const userParams = userStore?.userInfo ? JSON.stringify(userStore.userInfo) : '{}';

const updateKey = ref(0);
// const viewUrl = computed(() => {
//   return `https://192.168.1.157:5176/mobile-web-view/#/webViewWrapper/defaultMap?params=${encodeURIComponent(userParams)}&isWeb=${envParam}&updateKey=${updateKey.value}`;
// });
const viewUrl = computed(() => {
  return getWebViewUrl("/defaultMap", {
    isWeb: envParam,

 uniapps/work-app/src/subPackages/voiceCallDetail/index.vue

@@ -20,8 +20,8 @@
  const contact = options.contact ? JSON.parse(decodeURIComponent(options.contact)) : null;
  // 构建viewUrl，将contact参数拼接到URL中
  const contactParam = contact ? encodeURIComponent(JSON.stringify(contact)) : '';
  viewUrl.value = `https://192.168.1.157:5176/mobile-web-view/#/webViewWrapper/voiceCallDetail?params=${encodeURIComponent(userParams)}&contact=${contactParam}`;
  // viewUrl.value = 'https://192.168.57.124:5178/drone-command/demo';
  // viewUrl.value = `https://192.168.1.157:5176/mobile-web-view/#/webViewWrapper/voiceCallDetail?params=${encodeURIComponent(userParams)}&contact=${contactParam}`;
  viewUrl.value = getWebViewUrl("/voiceCallDetail", { contact: options.contact });
});
function onPostMessage(data) {}
// #ifdef APP-PLUS