Merge branch 'dev_v1.1.4' into dev_v1.1.4_220707

src/view/content/tool-box/index.vue

@@ -60,7 +60,7 @@ import { onMounted, reactive, ref } from "vue";
 let dom_toolbox = ref(null)
 let dom_iframe = ref(null)
 let state = reactive({
-    status: '加载', //
+    status: '', //
     show_alert: false,
     show_btn: true,
     list: [],
@@ -134,6 +134,7 @@ onMounted(() => {
 
 // detail函数
 const getDetail = () => {
+    state.status = '加载'
     httpContentToBack({
         url: `/post/getDetail`,
         params: {
@@ -146,19 +147,20 @@ const getDetail = () => {
             // 加载iframe
             let iframe = dom_iframe.value
             // state.detail.convertUrl = 'https://www.bilibili.com'
-            iframe.onerror = () => {
-                state.status = '网页错误'
-            }
-            iframe.onload = function () {
-                if (state.status != '固定右上角') {
-                    state.status = ''
-                }
-            }
+            // iframe.onerror = () => {
+            //     state.status = '网页错误'
+            // }
+            // iframe.onload = function () {
+            //     if (state.status != '固定右上角') {
+            //         state.status = ''
+            //     }
+            // }
             setTimeout(() => {
                 state.iframe_url = state.detail.convertUrl
+                state.status = ''
             }, 1000)
         } else {
-            state.status = ''
+            state.status = '网页错误'
         }
     })
 }