Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-detail.vue

@@ -204,6 +204,11 @@ export default {
         if (res.result === 'S') {
           vm.equip = res.lists
           vm.hlsPopup.showSuccess('发车成功')
+          setTimeout(() => {
+            vm.$router.push({
+              name: 'ConfirmList',
+            })
+          }, 2000)
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/myInfo/my-info.vue

@@ -47,7 +47,8 @@
         <div class="userInfo">我的合同</div>
         <div class="my-contract">
           <div class="content-wrap" @click="goSign">
-            <span v-if="signCount > 0"
+            <span
+              v-if="signCount > 0"
               :class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}"
             >{{ signCount > 99 ? '99+' : signCount }}</span>
             <img src="@/assets/myInfo/unSign.png" >
@@ -61,14 +62,16 @@
             <p>待确认</p>
           </div> -->
           <div class="content-wrap" @click="goVideoSign">
-            <span v-if="vedioCount > 0"
+            <span
+              v-if="vedioCount > 0"
               :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}"
             >{{ vedioCount > 99 ? '99+' : vedioCount }}</span>
             <img src="@/assets/myInfo/unFace.png" >
             <p>待面签</p>
           </div>
           <div class="content-wrap" @click="goCarConfirm">
-            <span v-if="carCount > 0"
+            <span
+              v-if="carCount > 0"
               :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}" style="margin-left:5px;"
             >{{ carCount > 99 ? '99+' : carCount }}</span>
             <img src="@/assets/myInfo/carConfirm.png" >
@@ -87,7 +90,8 @@
           <item @click.native="goMyProduct">
             <img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" >
             <div slot="name">我的收藏</div>
-            <div v-if="productCount > 0"
+            <div
+              v-if="productCount > 0"
               slot="right-icon"
               :class="{'right-icon-width':productCount>99, 'right-icon':productCount<99}"
             >{{ productCount > 99 ? '99+' : productCount }}</div>
@@ -796,4 +800,23 @@ export default {
   color: #fff;
   border-radius: 50%;
 }
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #my-info {
+      button {
+         margin-bottom: 98px;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #my-info {
+      button {
+         margin-bottom: 98px;
+      }
+    }
+  }
+}
 </style>

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

@@ -120,7 +120,7 @@ export default {
           vm.prj_lists = res.prj_lists
           vm.prj_lists.forEach(i => {
             i.cf_lists.forEach(j => {
-              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
+              let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
               vm.$set(j, 'amount', num)
             })
           })