Merge branch 'feature/FCRS-1048投保流程优化需求' into dev-new

src/views/ebiz/saleFlowProImprove/SignatureConfirmation.vue

@@ -2123,7 +2123,7 @@ export default {
         window.localStorage.setItem('insuredSignFile', JSON.stringify(this.insuredSign))
         window.localStorage.setItem('sign-val', val)
         this.$router.push({
-          path: 'flow-improve/sale/readDocuments',
+          path: '/flow-improve/sale/readDocuments',
           query: {
             orderNo: this.$route.query.orderNo,
             currentIndex: currentIndex + 1

src/views/ebiz/saleFlowProImprove/readDocuments.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='insuranceInformation-container redRadioCheckbox' :class="[isGuanhuaiBiaozhun === 0 ? '' : 'active1']">
     <!--文件导航 开始-->
-    <div class="xxx-fileList" v-if="!isPreview">
+    <div class="xxx-fileList" v-if="!isPreview" ref="xxx1">
       <p :key="index" v-for="(item, index) in fileList" :class="{ active: index+1 == current }"
          @click="fileListClick(item,index)"
          style="white-space: nowrap;display: flex;align-items: center;">
@@ -12,7 +12,7 @@
     <!--文件导航 结束-->
 
     <!-- 顶部提示 开始 -->
-    <p v-if='branchType != "14"' class="xxx-notice-bar">文件滑动至底部完成阅读</p>
+    <p v-if='branchType != "14"' class="xxx-notice-bar" ref="xxx2">文件滑动至底部完成阅读</p>
     <!-- 顶部提示 结束 -->
 
     <!-- 一键置底 开始 --> 
@@ -23,25 +23,25 @@
 
     <!--文件内容 开始-->
     <div id="pdf" ref="scrollableContent" @scroll="updateScrollProgress">
-      <div id="pdfH5ID"></div>
+      <div ref="xxx8" id="pdfH5ID"></div>
 	    <div ref="activeButtonEle"></div>
     </div>
     <!--文件内容 结束-->
 
     <!--底部提示和按钮 开始-->
     <div class="xxx-bottom">
-      <p class="xxx-isread">
+      <p class="xxx-isread" ref="xxx3">
         本人已阅读确认，理解并同意<span>{{documentName}}</span>各项内容
       </p>
-      <div class='bg-white bottom-btn' v-if="current != '1'">
+      <div class='bg-white bottom-btn' v-if="current != '1'" ref="xxx4">
         <van-button style="width: 30%;font-size: 16px;" plain type='danger' size='large' v-no-more-click='1000' @click="prevStep">上一步
         </van-button>
-        <van-button style="width: 70%;font-size: 16px;" type='danger' size='large' :disabled='scrollProgress <  70' @click='goNext' v-no-more-click='1000'>
+        <van-button style="width: 70%;font-size: 16px;" type='danger' size='large' :disabled='isyiye ? false : scrollProgress <  70' @click='goNext' v-no-more-click='1000'>
           我已阅读确认并理解，继续
         </van-button>
       </div>
-      <div class='bg-white bottom-btn' v-if="current == '1'">
-        <van-button class="fs20" type='danger' size='large'  :disabled='scrollProgress < 70' @click='goNext' v-no-more-click='1000'>我已阅读确认并理解，继续
+      <div class='bg-white bottom-btn' v-if="current == '1'" ref="xxx5">
+        <van-button class="fs20" type='danger' size='large'  :disabled='isyiye ? false : scrollProgress <  70' @click='goNext' v-no-more-click='1000'>我已阅读确认并理解，继续
         </van-button>
       </div>
     </div>
@@ -80,7 +80,8 @@
         scrollTimer: null,
 	      pdfStatus: void 0,
         scrollProgress: 0,
-        isGuanhuaiBiaozhun: Number(sessionStorage.getItem('oldVersionSwitch'))
+        isGuanhuaiBiaozhun: Number(sessionStorage.getItem('oldVersionSwitch')),
+        isyiye: false
       }
     },
     components: {
@@ -371,6 +372,12 @@
         }).on("complete",  (status, msg, time)=> { //监听完成事件
 					this.pdfStatus = status
           console.log("状态：" + status + "，信息：" + msg + "，耗时：" + time + "毫秒，总页数：" + this.totalNum)
+           if (this.current!= '1') {
+              this.isyiye = (window.innerHeight - (this.$refs.xxx1.clientHeight + this.$refs.xxx2.clientHeight + this.$refs.xxx3.clientHeight + this.$refs.xxx4.clientHeight)) > this.$refs.xxx8.clientHeight
+            } else {
+              this.isyiye = (window.innerHeight - (this.$refs.xxx1.clientHeight + this.$refs.xxx2.clientHeight + this.$refs.xxx3.clientHeight + this.$refs.xxx5.clientHeight)) > this.$refs.xxx8.clientHeight
+            }
+            console.log(this.isyiye)
         })
       },
       fileListClick(item,index) {