解决冲突

src/pages/contractRepayment/refund.vue

@@ -107,6 +107,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.show = false
       vm.getRefund()
     })
   },

src/pages/contractRepayment/repay-details.vue

@@ -28,7 +28,7 @@
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <div slot="content">{{ detailInfo.total_price }}</div>
+          <div slot="content">{{ detailInfo.total_price|currency }}</div>
         </item>
         <item>
           <div slot="name">商务政策</div>

src/pages/contractRepayment/repay-plan.vue

@@ -27,7 +27,6 @@
         </div>
       </div>
     </h-content>
-
   </h-view>
 </template>
 

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

@@ -34,7 +34,7 @@
                 <p>本次还款</p>
               </div>
               <div class="item-right">
-                <p>{{ e.due_amount|currency }}</p>
+                <p>{{ parseFloat(e.due_amount).toFixed(2)|currency }}</p>
                 <p>{{ e.received_amount|currency }}</p>
                 <input v-model="e.amount" type="text" placeholder="请输入还款金额" >
               </div>
@@ -102,7 +102,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      // vm.getDetail()
+      vm.getDetail()
     })
   },
 
@@ -312,7 +312,8 @@ export default {
               border: none;
               border-bottom: 1px solid #1d3fff;
               font-size: 13px;
-              text-align: center;
+              text-align: right;
+              float: right;
             }
             input::placeholder {
               font-family: PingFangSC-Regular;

src/pages/pay/firstPay/first-pay.vue

@@ -13,7 +13,7 @@
             <div class="title">当前应付</div>
             <div class="data">
               <span>￥</span>
-              {{ money |currency }}
+              {{ moneyToFix |currency }}
             </div>
           </div>
         </div>
@@ -27,7 +27,7 @@
             </div>
             <div class="pay-input">
               <span>应还首付款</span>
-              <input v-model="money" type="text" placeholder="请输入支付金额" >
+              <input v-model="moneyToFix" type="text" placeholder="请输入支付金额" >
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>
@@ -73,7 +73,11 @@ export default {
       }
     })
   },
-  computed: {},
+  computed: {
+    moneyToFix () {
+      return parseFloat(this.money).toFixed(2)
+    },
+  },
   watch: {},
   methods: {
     getDownPayment () {

src/pages/pay/payment/new-list.vue

@@ -39,7 +39,7 @@
               <img src="@/assets/payment/first-pay.png" >逾期利息
             </div>
             <div class="pay-input">
-              <span>应还利息</span>
+              <span>逾期利息</span>
               <input v-model="liquidated_damages" readonly type="text" placeholder="请输入支付金额" >
             </div>
           </div>
@@ -86,7 +86,7 @@ export default {
   },
   computed: {},
   watch: {
-    'pay_rent': {
+    'liquidated_damages': {
       handler () {
         this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages))
       },

src/pages/videoSign/video-list.vue

@@ -20,7 +20,7 @@
           </div>
           <div class="right">
             <div class="right-top">
-              <span>进件号</span>
+              <span>合同号</span>
               <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
@@ -30,7 +30,7 @@
                   <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
-                  已还租金
+                  产品线
                   <span>{{ item.division_n }}</span>
                 </li>
                 <li>