Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractSigning/body-check.vue

@@ -51,7 +51,7 @@
           </li>
           <li>
             <span>3</span>
-            <span>开启前置摄像头，用普通话朗读数字</span>
+            <span>完成录制，等待验证结果</span>
           </li>
         </ul>
       </div>

src/pages/contractSigning/contract-detail.vue

@@ -838,7 +838,7 @@ export default {
     width:100%;
     height:1.1rem;
     position: fixed;
-    bottom: 86px;
+    bottom: 92px;
     background: #fff;
     display: flex;
     justify-content: center;
@@ -851,7 +851,7 @@ export default {
       color: #fff;
       font-family: PingFangSC-Semibold;
       font-size: 0.3rem;
-      line-height: 0.4rem;
+      line-height: 0.88rem;
       letter-spacing: 0.2rem;
     }
 }
@@ -928,7 +928,7 @@ export default {
     height: 16px;
   }
   .alert {
-    padding-bottom: 150px;
+    padding-bottom: 160px;
     width: 100%;
     //margin-top: -10px;
     background: #fbf2d2;

src/pages/messageCenter/message-list.vue

@@ -4,14 +4,13 @@
       <div slot="center" class="top-word">消息通知</div>
     </h-header>
     <!-- <h-content class="content"> -->
-    <div v-if="list.length===0" class="null">
+    <div v-if="list.length===0">
       <div class="display">
-        <img src="@/assets/contractRepayment/null.png" alt="">
-        <p>暂时没有还款记录</p>
-        <div @click="$routeGo()">返回</div>
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
       </div>
     </div>
     <scroll
+      v-if="list.length !== 0"
       ref="scroll" :updateData="[list]" :pullUp="true" class="has-header"
       @pullingUp="getInfo">
       <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
@@ -182,6 +181,13 @@ export default {
   // .content {
   //   padding-top: 10px;
   // }
+  .display {
+    img {
+      width: 100%;
+      height: 100%;
+      margin-top: -70px;
+    }
+  }
   .swipeout-list {
     height: auto;
     padding: 0;

src/pages/pay/firstPay/contract-record.vue

@@ -88,10 +88,14 @@ export default {
           })
           if (notNaN.length !== 0) {
             notNaN.forEach(i => {
+              if (!isNaN(parseFloat(i))) {
                 a = a + parseFloat(i)
                 vm.money = a
+              }
+              vm.money = a
             })
-          } else {
+          } else if (notNaN.length === 0) {
+            debugger
             vm.money = 0
           }
         }

src/pages/pay/payment/contract-record.vue

@@ -144,12 +144,15 @@ export default {
           })
           if (notNaN.length !== 0) {
             notNaN.forEach(i => {
+              if (!isNaN(parseFloat(i))) {
                 a = a + parseFloat(i)
                 if (vm.money !== '') {
                   vm.sumMoney = parseFloat(a + parseFloat(vm.money))
                 } else {
                   vm.sumMoney = a
                 }
+              }
+              vm.money = a
             })
           } else {
             if (vm.money !== '') {

src/pages/videoSign/video-list.vue

@@ -8,7 +8,7 @@
     </h-header>
     <Tab :fatherTabNum="tabNum" @getTabNum="getTabNum" />
     <div class="search has-header">
-      <input placeholder="请输入进件号/承租人名称" >
+      <input v-model="searchInput" placeholder="请输入进件号/承租人名称" >
     </div>
     <scroll
       ref="scroll" :updateData="[showLists]" :pullUp="true" class="scroll"
@@ -36,7 +36,7 @@
               </li>
               <li>
                 预约面签时间
-                <span class="number">{{ dateConverse(item.apply_date) }}</span>
+                <span class="number">{{ item.apply_date }}</span>
               </li>
               <li>
                 <p v-if="item.interview_status ==='APPROVING'" class="to-unSign" @click="toSign">
@@ -112,19 +112,19 @@ export default {
   },
   created () {},
   methods: {
-    selectShowList () {
-      let vm = this
-      vm.undo = []
-      vm.done = []
-      vm.tabNum = 0
-      vm.undo = vm.lists.filter(i => {
-        return i.leases_status === 'N'
-      })
-      vm.done = vm.lists.filter(i => {
-        return i.leases_status === 'Y'
-      })
-      this.showList = this.undo
-    },
+    // selectShowList () {
+    //   let vm = this
+    //   vm.undo = []
+    //   vm.done = []
+    //   vm.tabNum = 0
+    //   vm.undo = vm.lists.filter(i => {
+    //     return i.leases_status === 'N'
+    //   })
+    //   vm.done = vm.lists.filter(i => {
+    //     return i.leases_status === 'Y'
+    //   })
+    //   this.showList = this.undo
+    // },
     getTabNum (i) {
       this.tabNum = i
       this.$refs.scroll.update(false)
@@ -252,6 +252,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.submitPagenum,
+          interview_status: 'APPROVING',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')
@@ -283,6 +284,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.approvedPagenum,
+          interview_status: 'RESERVED',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')
@@ -324,7 +326,7 @@ export default {
         user_phone: window.localStorage.user_phone,
         pagesize: 10,
         pagenum: vm.submitPagenum,
-        // confirm_status: 'SUBMIT',
+        interview_status: 'APPROVING',
         searchInput: vm.searchInput,
       }
       vm.hlsPopup.showLoading('请稍后')
@@ -354,6 +356,7 @@ export default {
         user_phone: window.localStorage.user_phone,
         pagesize: 10,
         pagenum: vm.approvedPagenum,
+        interview_status: 'RESERVED',
         // confirm_status: 'APPROVED',
         searchInput: vm.searchInput,
       }