askbot-dragon 1.3.59 → 1.3.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.3.59",
+  "version": "1.3.61",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

package/src/components/AnswerDocknowledge.vue

@@ -165,6 +165,11 @@ export default {
               url: url
             },"*");
           } else {
+            if (isMobile()) {
+              this.$refs.previewPdf.previewShowPopup = false;
+            } else {
+              this.$refs.previewPdf.drawer = false;
+            }
             let index = url.lastIndexOf('?')
             let type = ''
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'

package/src/components/previewPdf.vue

@@ -6,8 +6,8 @@
             <i class="iconfont guoran-shanchu"></i>
             </section>
         </div>
-        <template v-if="tagIds && tagIds.length != 0">
-            <pdfPosition :tagIds="tagIds"></pdfPosition>
+        <template v-if="tagIds && tagIds.length != 0 && previewShowPopup">
+            <pdfPosition :tagIds="tagIds" ></pdfPosition>
         </template>
         <template v-else>
           <div v-if="fileType == 'VIDEO'" style="width: 100%;height: calc(100% - 60px)">
@@ -29,11 +29,14 @@
             <iframe class="preview_iframe" :src="previewUrl" style="border:none;"></iframe>
           </template>
         </template>
+        <div class="loading_img" v-show="loading">
+            <img src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif" alt="">
+        </div>
     </van-popup>
   <el-drawer
       title="我是标题"
       :visible.sync="drawer"
-      v-else
+      v-else-if="drawer"
       :with-header="false"
       size="65%"
   >
@@ -43,7 +46,7 @@
         <i class="iconfont guoran-shanchu"></i>
       </section>
     </div>
-    <template v-if="tagIds && tagIds.length != 0">
+    <template v-if="tagIds && tagIds.length != 0 && drawer">
       <pdfPosition :tagIds="tagIds"></pdfPosition>
     </template>
     <template v-else>
@@ -66,6 +69,9 @@
         <iframe class="preview_iframe" :src="previewUrl" style="border:none;"></iframe>
       </template>
     </template>
+    <div class="loading_img" v-show="loading">
+            <img src="https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif" alt="">
+        </div>
   </el-drawer>
 </template>
 
@@ -79,8 +85,22 @@ export default {
             fileType:"",
             isPc:true,
             drawer:false,
-            tagIds: []
-            // '6454aa1a70573a6ead6f0f7d', '6454aa1a70573a6ead6f0f81'
+            tagIds: [],
+            // '6454aa1a70573a6ead6f0f7d', '6454aa1a70573a6ead6f0f81',
+            loading:true,
+        }
+    },
+    mounted() {
+        let iframe = document.getElementsByClassName('preview_iframe')[0]
+        if(iframe) {
+            // this.loading = true 
+            console.log('1111111');
+            iframe.onload = () =>{
+                this.loading = false 
+            }
+        }
+        if(this.fileType == 'VIDEO' || this.fileType == 'WECHAT' || (this.tagIds && this.tagIds.length != 0)) {
+            this.loading = false
         }
     },
     props:{
@@ -206,6 +226,22 @@ export default {
     padding: 0 20px;
     border-bottom: 1px solid #cccccc;
 }
+.loading_img {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: #FFF;
+    img {
+        width: 50px;
+        height: 50px;
+    }
+}
+
 .drawer-footer{
   width:100%;
   height: 50px;