From 511a73f92f3a5ccfc436f5b30f01a19d6e30e5f8 Mon Sep 17 00:00:00 2001
From: xuminyui <576362016@qq.com>
Date: Thu, 17 Oct 2024 13:36:41 +0800
Subject: [PATCH] fix

---
 src/pages/detail/index.vue   | 10 +++++++++-
 src/pages/index/index.vue    | 12 +++++++++++-
 src/pages/painting/index.vue | 10 +++++++++-
 utils/index.js               | 23 ++++++++++++++---------
 4 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 51d517e..66c4808 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -74,7 +74,7 @@
 
 <script setup>
 import { ref, reactive, onBeforeMount } from "vue";
-import { closeWebview, runTimeEnv } from "../../../utils/index.js";
+import { closeWebview } from "../../../utils/index.js";
 
 import { onLoad } from "@dcloudio/uni-app";
 import useToast from "@/hooks/toast/useToast.js";
@@ -134,6 +134,14 @@ const doneSet = async () => {
 const backScan = () => {
   closeWebview();
 };
+const runTimeEnv = () => {
+  if (plus) {
+    const currentWebView = plus.webview.getWebviewById("wv");
+    return currentWebView.RunTime === "app";
+  } else {
+    return false;
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 19ce9e2..033242e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -98,7 +98,7 @@ import { ref, reactive, onBeforeMount } from "vue";
 import useToast from "@/hooks/toast/useToast.js";
 import { onLoad, onReachBottom } from "@dcloudio/uni-app";
 import { creChangepainting, add } from "@/api/login.js";
-import { closeWebview, runTimeEnv } from "../../../utils/index";
+import { closeWebview } from "../../../utils/index";
 
 const { showMessage } = useToast();
 const loading = ref(false);
@@ -235,6 +235,16 @@ const enlarge = (src) => {
 const backScan = () => {
   closeWebview();
 };
+const runTimeEnv = () => {
+  try {
+    if (plus) {
+      const currentWebView = plus.webview.getWebviewById("wv");
+      return currentWebView.RunTime === "app";
+    }
+  } catch (e) {
+    return false;
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/painting/index.vue b/src/pages/painting/index.vue
index 6970bde..e8562c7 100644
--- a/src/pages/painting/index.vue
+++ b/src/pages/painting/index.vue
@@ -53,7 +53,7 @@ import { ref, reactive, onBeforeMount } from "vue";
 import useToast from "@/hooks/toast/useToast.js";
 import { onLoad } from "@dcloudio/uni-app";
 import { freebox, bind, check_freebox, cancel } from "@/api/login.js";
-import { closeWebview, runTimeEnv } from "../../../utils/index";
+import { closeWebview } from "../../../utils/index";
 const { showMessage } = useToast();
 const loading = ref(false);
 const isButtonDisabled = ref(false);
@@ -141,6 +141,14 @@ const check = async () => {
     showMessage({ type: "error", message: res.msg });
   }
 };
+const runTimeEnv = () => {
+  if (plus) {
+    const currentWebView = plus.webview.getWebviewById("wv");
+    return currentWebView.RunTime === "app";
+  } else {
+    return false;
+  }
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/utils/index.js b/utils/index.js
index f510ff3..27d3af2 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1,12 +1,17 @@
-const currentWebView = plus.webview.getWebviewById("wv");
+// export const runTimeEnv = () => {
+//   if (plus) {
+//     const currentWebView = plus.webview.getWebviewById("wv");
+//     return currentWebView.RunTime === "app";
+//   } else {
+//     return false;
+//   }
+// };\
 
-export const runTimeEnv = () => {
-  if (plus) {
-    return currentWebView.RunTime === "app";
-  } else {
-    return false;
+export const closeWebview = () => {
+  try {
+    const currentWebView = plus.webview.getWebviewById("wv");
+    currentWebView.close();
+  } catch (e) {
+    return () => {};
   }
 };
-export const closeWebview = () => {
-  currentWebView.close();
-};