askbot-dragon 1.3.64 → 1.3.66

package/package.json

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

package/src/components/AnswerDocknowledge.vue

@@ -165,11 +165,14 @@ export default {
               url: url
             },"*");
           } else {
-            if (isMobile()) {
-              this.$refs.previewPdf.previewShowPopup = false;
-            } else {
-              this.$refs.previewPdf.drawer = false;
-            }
+            // if (isMobile()) {
+            //   this.$refs.previewPdf.drawer = true;
+            //   this.$refs.previewPdf.previewShowPopup = false;
+            // } else {
+            //   this.$refs.previewPdf.drawer = false;
+            // }
+            this.$refs.previewPdf.previewShowPopup = false;
+            this.$refs.previewPdf.drawer = false;
             let index = url.lastIndexOf('?')
             let type = ''
             let httpUrl = '/knowledge-api/knowledge/getTemporaryCertificate'
@@ -190,8 +193,10 @@ export default {
               if(res.data.code == '0') {
                 this.previewHref = res.data.data;
                 if (isMobile()){
+                  this.$refs.previewPdf.drawer = true;
                   this.$refs.previewPdf.previewShowPopup = true;
                 } else {
+                  this.$refs.previewPdf.previewShowPopup = false;
                   this.$refs.previewPdf.drawer = true;
                 }
                 this.$refs.previewPdf.fileType = type
@@ -210,7 +215,6 @@ export default {
               }
             })
           }
-
         },
         fileType (url) {
             const fileType = url.substring(url.lastIndexOf('.'));

package/src/components/pdfPosition.vue

@@ -61,7 +61,15 @@ export default {
             currentPage: 0,
             changetoolbar: false,
             allTr:[],
-            preViewType: 'pdf'
+            preViewType: 'pdf',
+            displacement:{
+                pageX:0,
+                pageY:0,
+                moveable:false,
+                pageX2:0,
+                pageY2:0,
+                originScale:1,
+            }
         }
     },
     // methods:{
@@ -827,14 +835,14 @@ export default {
                         that.displacement.pageY2 = events2.pageY;
                     }
 
-                    that.displacement.originScale = that.displacement.scale || 1;
+                    that.displacement.originScale = this.scale || 1;
                     // console.log(that.displacement);
                 });
                 document.addEventListener("touchmove", function (event) {
                     if (!that.displacement.moveable) {
                         return;
                     }
-                    event.preventDefault();
+                    // event.preventDefault();
                     let touches = event.touches;
                     let events = touches[0];
                     let events2 = touches[1];
@@ -885,7 +893,11 @@ export default {
                     }
                 });
             });
-        }
+        },
+        getDistance(start, stop) {
+            // Math.hypot()计算参数的平方根
+            return Math.hypot(stop.x - start.x, stop.y - start.y);
+        },
     },
     computed:{
         perviewUrl() {

package/src/components/previewPdf.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}" v-if="previewShowPopup">
+    <!-- <van-popup v-model="previewShowPopup" position="bottom" :style="{ height: '90%', background:'#FFFFFF'}" v-if="previewShowPopup">
       <div class="footer">
         <span>查看详情</span>
             <section @click="close">
@@ -32,14 +32,17 @@
         <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>
+    </van-popup> -->
   <el-drawer
       title="我是标题"
       :visible.sync="drawer"
-      v-else-if="drawer"
       :with-header="false"
-      size="65%"
+      :append-to-body="true"
+      :destroy-on-close="true"
+      :direction="previewShowPopup ? 'btt' : 'ltr'"
+      :size="previewShowPopup ? '90%' : '65%'"
   >
+    <!-- v-else-if="drawer" -->
     <div class="drawer-footer">
       <span>查看详情</span>
       <section @click="close">