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

jydocs-pc/src/views/Content.vue

@@ -62,7 +62,7 @@
               <span @click="goRenew" style="color: #2ABED1;cursor: pointer;">请点击前往续费＞</span>
               <span @click="redShow = false" class="time-tip-close el-icon-close"></span>
             </div>
-            <div class="doc-detail-ad" v-else-if="!redShow && jyPcDocmemberDetail.length">
+            <div class="doc-detail-ad" v-else-if="!redShow && jyPcDocmemberDetail && jyPcDocmemberDetail.length">
               <div class="doc-detail-ad-img">
                 <a :href="jyPcDocmemberDetail[0].s_link || 'javascript:;'">
                   <img :src="jyPcDocmemberDetail[0].s_pic" :alt="jyPcDocmemberDetail[0].s_remark" />
@@ -128,6 +128,7 @@
               </div>
             </div>
           </div>
+          <div class="transition-dom" ref="transitionDom"></div>
         </div>
       </div>
       <collect-info ref="collectRef"></collect-info>
@@ -415,9 +416,12 @@ export default {
       } else if (this.fileTypeThis === 'xlsx' || this.fileTypeThis === 'xls') {
         t = document.getElementById('xlsxPage')
       }
+      const targetElement = this.$refs.transitionDom
+      const rect = targetElement.getBoundingClientRect()
+      const innerHeight = window.innerHeight
       const b = t.getBoundingClientRect().bottom
       const dom = document.getElementById('footp')
-      if (b < 500) {
+      if (b < 500 || rect.top < innerHeight) {
         dom.style.position = 'unset'
       } else {
         dom.style.position = 'fixed'

jydocs-pc/src/views/Home.vue

@@ -654,6 +654,15 @@ export default {
             width: 100%;
             height: 100%;
           }
+          ::v-deep{
+            .el-carousel__indicator {
+              padding: 10px;
+            }
+            .el-carousel__button{
+              width: 6px;
+              height: 6px;
+            }
+          }
         }
       }
       .word-recommend-ad{