From f155b8715f7a2f2f82de88246f584aaf4eedb791 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 05 Feb 2026 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/config/env.js | 6 +++---
uniapps/work-app/src/App.vue | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/uniapps/work-app/src/App.vue b/uniapps/work-app/src/App.vue
index 3240b20..94cb54c 100644
--- a/uniapps/work-app/src/App.vue
+++ b/uniapps/work-app/src/App.vue
@@ -11,8 +11,8 @@
onShow(async () => {
console.log("App Show");
- // 应用从后台返回前台时，重新初始化位置服务
- if (userStore.userInfo && locationStore) {
+ // 确保只有在用户已登录的情况下才初始化位置服务
+ if (userStore.userInfo && userStore.userInfo.username && locationStore) {
try {
await locationStore.initLocationService();
} catch (error) {
diff --git a/uniapps/work-app/src/config/env.js b/uniapps/work-app/src/config/env.js
index 8f75662..a372b89 100644
--- a/uniapps/work-app/src/config/env.js
+++ b/uniapps/work-app/src/config/env.js
@@ -12,10 +12,10 @@
const development = {
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:5179/mobile-web-view/#/webViewWrapper',
+ VITE_APP_WEBVIEW_URL: 'https://wrj.shuixiongit.com/mobile-web-view/#/webViewWrapper',
+ // VITE_APP_WEBVIEW_URL: 'https://192.168.1.157:5179/mobile-web-view/#/webViewWrapper',
VITE_API_BASE_URL: 'http://218.202.104.82:8200',
- VITE_API_BASE_URL_GD: 'http://192.168.1.33',
+ VITE_API_BASE_URL_GD: 'http://219.146.74.42:8015/api/',
// VITE_API_BASE_URL: 'https://aisky.org.cn/api',
VITE_APP_WS_API_URL:'wss://wrj.shuixiongit.com/drone-wss/api/v1/ws',
--
Gitblit v1.9.3