From 648904d076ae6e17892b40675598b1c8dc474277 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 24 Apr 2026 16:21:12 +0800
Subject: [PATCH] Merge branch 'feature/v9.0/9.0.3' into feature/v9.0/9.0.4

---
 src/subPackages/droneConsole/index.vue |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/subPackages/droneConsole/index.vue b/src/subPackages/droneConsole/index.vue
index bf30ab0..a947943 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?wayLineJobInfoId=${data.taskDetails.id}`
+    // });
+    // #ifdef H5
+    window.history.back()
+    // #endif
+
+    // #ifdef APP-PLUS
     uni.navigateBack({
       delta: 1 // 返回的页面数,默认1(返回上一页)
     });
+    // #endif
   }
 }
 
@@ -83,17 +92,19 @@
 })
 
 
-// onShow(() => {
-//   // #ifdef APP-PLUS
-//   plus.screen.lockOrientation("landscape-primary");
-//   // #endif
-// });
-//
-// onHide(() => {
-//   // #ifdef APP-PLUS
-//   plus.screen.lockOrientation("portrait-primary");
-//   // #endif
-// });
+onShow(() => {
+  // #ifdef APP-PLUS
+  plus.navigator.setFullscreen(true); // 加入全屏
+  plus.screen.lockOrientation("landscape-primary");//横屏
+  // #endif
+});
+
+onHide(() => {
+  // #ifdef APP-PLUS
+  plus.navigator.setFullscreen(false);
+  plus.screen.lockOrientation("portrait-primary");
+  // #endif
+});
 </script>
 <style scoped lang="scss">
 

--
Gitblit v1.9.3