Browse Source

Merge branch 'dev/v1.2.11_tsz' of jianyu/jy-docs into feature/v1.2.11

汤世哲 1 year ago
parent
commit
c52f02f228
1 changed files with 9 additions and 7 deletions
  1. 9 7
      jydocs-pc/src/views/Content.vue

+ 9 - 7
jydocs-pc/src/views/Content.vue

@@ -41,15 +41,15 @@
             <div class="file-content file-word-docx" id="docxPage" v-if="fileTypeThis === 'docx'">
               <vue-office-docx
                   :src="fileSrc.docSrc"
-                  style="height: 100vh;"
+                  style="margin-bottom: 24px;"
                   @rendered="rendered"
               />
             </div>
             <div class="file-content file-word-docx" id="xlsxPage" v-if="fileTypeThis === 'xlsx' || fileTypeThis === 'xls'">
               <vue-office-excel
                   :src="fileSrc.excelSrc"
-                  style="height: 100vh;"
                   :options="excelOptions"
+                  style="margin-bottom: 24px;"
                   @rendered="rendered"
                   @error="errorHandler"
               />
@@ -260,8 +260,6 @@ export default {
   },
   mounted () {
     this.details()
-    // 监听滚轮
-    this.initHeight()
     window.addEventListener('scroll', this.initHeight)
   },
   beforeMount () {
@@ -419,9 +417,7 @@ export default {
       }
       const b = t.getBoundingClientRect().bottom
       const dom = document.getElementById('footp')
-      console.log(t, 't')
-      console.log(b, 'b')
-      if (b < 700) {
+      if (b < 500) {
         dom.style.position = 'unset'
       } else {
         dom.style.position = 'fixed'
@@ -592,6 +588,10 @@ export default {
             this.buyShow()
           }
           this.collectd = res.data.collect
+          // 监听滚轮
+          setTimeout(() => {
+            this.initHeight()
+          }, 500);
         } else {
           Message({
             message: res.error_msg,
@@ -1135,6 +1135,7 @@ export default {
         ::v-deep {
           .docx-wrapper {
             padding: 0;
+            background: #fff;
           }
           .vue-office-docx .docx-wrapper>section.docx{
             width: 100%!important;
@@ -1149,6 +1150,7 @@ export default {
         box-shadow: 0px 0px 28px 0px rgba(0, 0, 0, 0.08);
         padding: 0;
         border-radius: 0;
+        z-index: 99;
         .member-time-tip{
           position: relative;
           display: flex;