Merge branch 'dev_v1.1.4' of https://git.yishihui.com/DeNet/de-net into dev_v1.1.4

src/view/content/tool_box/index.vue

@@ -2,7 +2,7 @@
     <div class="denet-toolbox" @click.stop="clickHead" ref="dom_toolbox" :class="{ 'pre-view': pre_view }">
         <div class="head" @click.stop="clickHead">
             <span></span>
-            <div v-show="state.show_btn">
+            <div v-show="state.show_btn && state.status == ''">
                 <img :src="require('@/assets/img/icon-fixed.png')" alt class="fixed" @click.stop="clickFixed" />
                 <img :src="require('@/assets/img/icon-full.png')" alt class="full" @click.stop="clickFull" />
                 <!-- <img :src="require('@/assets/img/icon-close.png')" alt class="full" @click="clickFull" /> -->
@@ -145,17 +145,19 @@ const getDetail = () => {
             console.log('postBizData', state.detail)
             // 加载iframe
             let iframe = dom_iframe.value
-            // state.detail.originUrl = 'https://www.bilibili.com'
+            // state.detail.convertUrl = 'https://www.bilibili.com'
             iframe.onerror = () => {
                 state.status = '网页错误'
             }
             iframe.onload = function () {
-                state.status = ''
+                if (state.status != '固定右上角') {
+                    state.status = ''
+                }
             }
             setTimeout(() => {
-                state.iframe_url = state.detail.originUrl
+                state.iframe_url = state.detail.convertUrl
             }, 1000)
-        } else{
+        } else {
             state.status = ''
         }
     })
@@ -394,6 +396,7 @@ const clickFull = () => {
 
         .state {
             text-align: center;
+
             img {
                 margin-bottom: 14px;
             }
@@ -403,7 +406,7 @@ const clickFull = () => {
             }
 
             div {
-                    margin-bottom: 40px;
+                margin-bottom: 40px;
                 color: #8E8E8E;
                 text-align: center;
                 font-weight: 500;