Merge branch 'dev/v1.2.15_zsy' of jianyu/jy-docs into feature/v1.2.15

jydocs-mobile/src/views/details/details.vue

@@ -298,6 +298,15 @@ import '@vue-office/docx/lib/index.css'
 import VueOfficeExcel from '@vue-office/excel'
 // 引入相关样式
 import '@vue-office/excel/lib/index.css'
+
+const config = {
+  PAGE_TO_VIEW: 0,
+  SCALE: 1.0,
+  CMAP_URL: 'https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/cmaps/',
+  CMAP_PACKED: true,
+  workerSrc: 'https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.worker.min.js'
+}
+
 @Component({
   name: 'details-p',
   mixins: [MixinTop],
@@ -623,7 +632,13 @@ export default class extends Vue {
 
   getNumPages (url: string, type: any) {
     try {
-      const loadingTask = pdf.createLoadingTask(url)
+      console.log(77777777)
+      const loadingTask = pdf.createLoadingTask({
+        url,
+        cMapUrl: config.CMAP_URL,
+        cMapPacked: config.CMAP_PACKED
+      })
+      console.log(loadingTask)
       loadingTask.promise.then((pdf: any) => {
         const nums = type === 'preview' ? this.previewConfig.pageNums : pdf.numPages
         this.pdfPage.url = loadingTask
@@ -633,6 +648,7 @@ export default class extends Vue {
         console.error('pdf加载失败', err)
       })
     } catch (e: any) {
+      console.log(4444444444)
       console.log(e)
     }
   }

jydocs-pc/public/index.html

@@ -18,8 +18,8 @@
       <script src="https://jybx3-webtest.jydev.jianyu360.com/js/jquery-3.2.1.min.js?v=6302"></script>
       <script src="https://jybx3-webtest.jydev.jianyu360.com/js/jquery.cookie.js"></script>
       <script src="https://jybx3-webtest.jydev.jianyu360.com/js/bootstrap.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/pdfjs-dist@2.1.266/build/pdf.min.js"></script>
-      <script src="https://cdn.jsdelivr.net/npm/pdfjs-dist@2.1.266/web/pdf_viewer.js"></script>
+      <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.min.js"></script>
+      <script src="https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/web/pdf_viewer.js"></script>
       <!-- <script src="https://cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js"></script>
       <script src="https://jybx3-webtest.jydev.jianyu360.com/common-module/pc-dialog/js/pc-collect-user-info.min.js"></script>
       <link href='https://jybx3-webtest.jydev.jianyu360.com/common-module/pc-dialog/css/collect-user-info.css' rel="stylesheet" type="text/css"/> -->

jydocs-pc/src/views/Content.vue

@@ -242,9 +242,9 @@ export default {
       config: {
         PAGE_TO_VIEW: 0,
         SCALE: 1.0,
-        CMAP_URL: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.1.266/cmaps/',
+        CMAP_URL: 'https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/cmaps/',
         CMAP_PACKED: true,
-        workerSrc: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.1.266/build/pdf.worker.min.js'
+        workerSrc: 'https://cdn-common.jianyu360.com/cdn/lib/pdfjs-dist/2.1.266/build/pdf.worker.min.js'
       },
       pData: {
         heightList: []
@@ -320,8 +320,11 @@ export default {
       const nArr = arr.concat(oldArr)
       return nArr.splice(0, 3)
     },
+    isDocVip () {
+      return this.docsInfo.docStatus > 0
+    },
     showCostBtn () {
-      return (this.buyed !== 1 && !this.docsInfo.docStatus && this.docsInfo.freeDownload === 1 && this.downloadStatus !== 1) || !this.islogin
+      return (this.buyed !== 1 && !this.isDocVip && this.docsInfo.freeDownload === 1 && this.downloadStatus !== 1) || !this.islogin
     },
     // 未购买预览时，未读页码; 或者豆丁渲染错误，
     unreadPage () {
@@ -356,7 +359,7 @@ export default {
         }
       }
       // 会员免费文档+未下载+不是会员+未使用1次免费下载特权
-      if (this.islogin && this.datas.productType === 1 && this.buyed === 0 && !this.docsInfo.docStatus && this.docsInfo.freeDownload !== 1) {
+      if (this.islogin && this.datas.productType === 1 && this.buyed === 0 && !this.isDocVip && this.docsInfo.freeDownload !== 1) {
         btnText = '使用免费下载特权阅读全文'
       }
       if (this.buyed === 1 && this.datas.docFileType === 2) {
@@ -799,7 +802,7 @@ export default {
         }
         return
       }
-      if (this.buyed !== 1 && !this.docsInfo.docStatus && this.docsInfo.freeDownload !== 1 && this.datas.productType === 1) {
+      if (this.buyed !== 1 && !this.isDocVip && this.docsInfo.freeDownload !== 1 && this.datas.productType === 1) {
         this.downLoadFreeEvent()
       } else {
         this.loadFile()