From f685c364f07ee6f12b3ffd368a93eb0dad26090e Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 26 Nov 2025 13:45:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/subPackages/workDetail/index.vue | 4 ++--
src/subPackages/droneConsole/index.vue | 9 +++++++++
src/pages/work/index.vue | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index cecf111..2272364 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -31,7 +31,7 @@
} else if (data.type === 'workid') {
uni.navigateTo({
- url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}`
+ url: `/subPackages/workDetail/index?eventNum=${data.eventNum}&totalNum=${data.totalNum}&keyword=${data.keyword}&aiType=${data.aiType}&status=${data.status}`
});
} else if (data.type === 'bigImage') {
uni.navigateTo({
diff --git a/src/subPackages/droneConsole/index.vue b/src/subPackages/droneConsole/index.vue
index a745229..1543671 100644
--- a/src/subPackages/droneConsole/index.vue
+++ b/src/subPackages/droneConsole/index.vue
@@ -18,9 +18,18 @@
function onPostMessage(data) {
if (data.type === 'back'){
+ // uni.navigateTo({
+ // url: `/subPackages/inProgress/index?wayLineJodInfoId=${data.taskDetails.id}`
+ // });
+ // #ifdef H5
+ window.history.back()
+ // #endif
+
+ // #ifdef APP-PLUS
uni.navigateBack({
delta: 1 // 返回的页面数，默认1（返回上一页）
});
+ // #endif
}
}
diff --git a/src/subPackages/workDetail/index.vue b/src/subPackages/workDetail/index.vue
index fb4f729..6fc8a4c 100644
--- a/src/subPackages/workDetail/index.vue
+++ b/src/subPackages/workDetail/index.vue
@@ -15,13 +15,13 @@
const viewUrl = ref('')
onLoad( (options) => {
const eventNum= options.eventNum;
- viewUrl.value = getWebViewUrl('/workDetail', {eventNum:eventNum,totalNum:options.totalNum,keyword:options.keyword,aiType:options.aiType,wLJobInfoId:options.wLJobInfoId})
+ viewUrl.value = getWebViewUrl('/workDetail', {eventNum:eventNum,totalNum:options.totalNum,keyword:options.keyword,aiType:options.aiType,wLJobInfoId:options.wLJobInfoId,status:options.status})
});
function onPostMessage(data) {
if (data.type === 'workback'){
-uni.setStorageSync('joinParams', {
+ uni.setStorageSync('joinParams', {
type: 'add'
});
uni.switchTab({
--
Gitblit v1.9.3