Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/base.vue

 <template>
   <h-view id="approval" class="public-style" title="进件审批">
-    <div v-if="!isConfirm" class="modal">
+    <div v-if="!isConfirm" class="myModal">
       <div class="box">
         <span class="title-box">征信授权书</span>
         <div class="content-box">
@@ -201,12 +201,14 @@ export default {
       isDown: false,
     }
   },
-  mounted () {},
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.popProtocol()
-    })
+  mounted () {
+    this.popProtocol()
   },
+  // beforeRouteEnter (to, from, next) {
+  //   next(vm => {
+  //     vm.popProtocol()
+  //   })
+  // },
   methods: {
     getTabNum (i) {
       this.tabNum = i
@@ -222,7 +224,7 @@ export default {
       this.isConfirm = true
     },
     popProtocol () {
-      let modal = document.querySelector('.modal')
+      let modal = document.querySelector('.myModal')
       let alpha = 0
       let addOpacity = setInterval(() => {
         alpha += 1
@@ -403,7 +405,7 @@ export default {
       }
     }
   }
-  .modal {
+  .myModal {
     width: 100%;
     height: 100%;
     position: absolute;