提交代码

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

@@ -9,7 +9,7 @@
         <div class="middles">
             <h3>摘要</h3>
             <p>{{detailData.docSummary}}</p>
-            <div class="continue" v-show="buyed == 0">全文共{{detailData.docPageSize}}页，<span @click="continued">继续阅读<van-icon name="arrow-down" size="18" /></span></div>
+            <div class="continue" v-show="buyed == 0">全文共{{detailData.docPageSize}}页，<span @click="continued">阅读全文<van-icon name="arrow-down" size="18" /></span></div>
         </div>
         <van-sticky :offset-top="Offset" @scroll="stickyScroll" v-show="buyed == 1">
           <div class="head-tip" :class="{'is-fixed':fixed}">
@@ -17,7 +17,7 @@
                 <van-icon class="word01" :name="'diy-' + fileType(detailData.docFileType)" />
                 <span class="flex">{{detailData.docName}}</span>
               </h3>
-<!--              <span class="pages"><i id="page_num"></i> / <i id="page_count"></i></span>-->
+             <!-- <span class="pages"><i id="page_num"></i> / <i>{{detailData.docPageSize}}</i></span> -->
           </div>
         </van-sticky>
         <div class="botts" v-show="buyed == 1">
@@ -103,14 +103,6 @@ export default class extends Vue {
   buyed = 0
   flag = false
   pdfh5 = null
-  pdfDocument: any
-  config: any = {
-    PAGE_TO_VIEW: 0,
-    SCALE: 0,
-    CMAP_URL: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.6.347/cmaps/',
-    CMAP_PACKED: true,
-    workerSrc: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@2.6.347/build/pdf.worker.min.js'
-  }
 
   pData: any = {
     heightList: []
@@ -131,28 +123,6 @@ export default class extends Vue {
     this.onList()
   }
 
-  mounted () {
-    // 监听滚轮
-    window.addEventListener('scroll', this.initHeight)
-  }
-
-  destroyed () { // 移除监听
-    window.removeEventListener('scroll', this.initHeight)
-  }
-
-  initHeight () {
-    const top = window.scrollY
-    // console.log(top)
-    let base = 0
-    for (let i = 0; i < this.pData.heightList.length; i++) {
-      base += this.pData.heightList[i]
-      if (top <= base) {
-        this.updateText({ type: 'num', value: i + 1 })
-        break
-      }
-    }
-  }
-
   get Offset () {
     const tempN = document.querySelector('.j-header.jy-app-header') as HTMLDivElement
     if (tempN) {
@@ -165,6 +135,7 @@ export default class extends Vue {
   getNumPages (url: string) {
     const loadingTask = pdf.createLoadingTask(url)
     loadingTask.promise.then((pdf: any) => {
+      console.log(pdf)
       this.pdfPage.url = loadingTask
       this.pdfPage.pageNum = pdf.numPages
     }).catch((err: any) => {
@@ -205,8 +176,8 @@ export default class extends Vue {
 
   stickyScroll (data: any) {
     const tops = data.scrollTop
-    // console.log(this.$parent.$el.scrollTop)
     let base = 0
+    // console.log(this.pData.heightList)
     for (let i = 0; i < this.pData.heightList.length; i++) {
       base += this.pData.heightList[i]
       if (tops <= base) {
@@ -325,6 +296,8 @@ export default class extends Vue {
 @include diy-icon('guanzhu', 20, 20);
 @include diy-icon('iconJianYu', 24, 24);
 .details-p {
+    height: 100%;
+    overflow: scroll;
     padding-bottom: 80px;
     box-sizing: border-box;
     .tops {
@@ -383,8 +356,8 @@ export default class extends Vue {
     }
     .head-tip {
         width: auto;
-        height: 40px;
-        background: #fcfcfc;
+        height: 0;
+        background: #fff;
         display: flex;
         justify-content: flex-end;
         align-items: center;
@@ -424,6 +397,7 @@ export default class extends Vue {
         }
     }
     .is-fixed {
+        height: 40px;
         justify-content: space-between;
     }
     .botts {

jydocs-mobile/yarn.lock

@@ -1587,11 +1587,21 @@ ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+alloyfinger@^0.1.16:
+  version "0.1.16"
+  resolved "https://registry.npm.taobao.org/alloyfinger/download/alloyfinger-0.1.16.tgz#8d5d46073cf1fedba5f446e666bc4b3925b8b8b5"
+  integrity sha1-jV1GBzzx/tul9EbmZrxLOSW4uLU=
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -1823,6 +1833,11 @@ async@^2.6.2:
   dependencies:
     lodash "^4.17.14"
 
+async@~0.2.6:
+  version "0.2.10"
+  resolved "https://registry.npm.taobao.org/async/download/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -3268,6 +3283,11 @@ cyclist@^1.0.1:
   resolved "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
+dandy@:
+  version "0.0.5"
+  resolved "https://registry.npm.taobao.org/dandy/download/dandy-0.0.5.tgz#4a229f73330723ab0598a9bd569d8110c19241b7"
+  integrity sha1-SiKfczMHI6sFmKm9Vp2BEMGSQbc=
+
 dargs@^4.0.1:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/dargs/download/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
@@ -6679,6 +6699,13 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
+optimist@~0.3.5:
+  version "0.3.7"
+  resolved "https://registry.npm.taobao.org/optimist/download/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
+  integrity sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=
+  dependencies:
+    wordwrap "~0.0.2"
+
 optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.npm.taobao.org/optionator/download/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
@@ -8389,6 +8416,13 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM=
 
+source-map@~0.1.7:
+  version "0.1.43"
+  resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -8966,6 +9000,14 @@ tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+transformjs@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.npm.taobao.org/transformjs/download/transformjs-0.0.4.tgz#417be04a47a9add032e3e433d8a40f9266e524d2"
+  integrity sha1-QXvgSkeprdAy4+Qz2KQPkmblJNI=
+  dependencies:
+    dandy ""
+    uglify-js "2.4.12"
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -9124,6 +9166,16 @@ typescript@~3.9.3:
   resolved "https://registry.npm.taobao.org/typescript/download/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
   integrity sha1-mNYApevcOPQMsndSLxLcgA6eJfo=
 
+uglify-js@2.4.12:
+  version "2.4.12"
+  resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-2.4.12.tgz?cache=0&sync_timestamp=1616976072884&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-2.4.12.tgz#2354d9659f85330c1e3e2910f8acd77fe14bb4a8"
+  integrity sha1-I1TZZZ+FMwwePikQ+KzXf+FLtKg=
+  dependencies:
+    async "~0.2.6"
+    optimist "~0.3.5"
+    source-map "~0.1.7"
+    uglify-to-browserify "~1.0.0"
+
 uglify-js@3.4.x:
   version "3.4.10"
   resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.4.10.tgz?cache=0&sync_timestamp=1598213312680&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
@@ -9137,6 +9189,11 @@ uglify-js@^3.1.4:
   resolved "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.10.2.tgz?cache=0&sync_timestamp=1598213312680&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.10.2.tgz#8cfa1209fd04199cc8a7f9930ddedb30b0f1912d"
   integrity sha1-jPoSCf0EGZzIp/mTDd7bMLDxkS0=
 
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npm.taobao.org/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -9677,6 +9734,11 @@ wordwrap@^1.0.0:
   resolved "https://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"