Merge branch 'liuxin' into develop

src/pages/contractRepayment/refund.vue

@@ -66,18 +66,23 @@
           <span>{{ selectMonth(item.repayment_date) }}</span>
         </div>
         <div class="message">
-          <p class="top">
-            款项
-            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
-            <span>{{ item.pay_method }}</span>
-          </p>
+          <div class="name">
+            <p>
+              现金流项目
+              <span>支付方式</span>
+            </p>
+            <p>
+              {{ item.cf_item_name }}
+              <span>{{ item.pay_method }}</span>
+            </p>
+          </div>
           <div class="name">
             <p>
               应还金额
               <span>已还金额</span>
             </p>
             <p>
-              {{ item.due_amount|currency }}
+              {{ parseFloat(item.due_amount).toFixed(2)|currency }}
               <span
                 :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
               >{{ item.received_amount|currency }}</span>
@@ -255,6 +260,8 @@ export default {
       .message {
         flex: 12;
         //height: 85%;
+        display: flex;
+        justify-content: space-between;
       }
       .left {
         height: 30px;
@@ -297,21 +304,21 @@ export default {
       .green {
         background-color: rgba(27, 162, 97, 0.5);
       }
-      .top {
-        font-family: PingFangSC-Regular;
-        font-size: 13px;
-        color: rgba(56, 63, 69, 0.6);
-        letter-spacing: 0;
-        display: flex;
-        justify-content: space-between;
-        span {
-          // margin-left: 20px;
-          font-family: PingFangSC-Regular;
-          font-size: 13px;
-          color: #4b4a4b;
-          letter-spacing: 0;
-        }
-      }
+      // .top {
+      //   font-family: PingFangSC-Regular;
+      //   font-size: 13px;
+      //   color: rgba(56, 63, 69, 0.6);
+      //   letter-spacing: 0;
+      //   display: flex;
+      //   justify-content: space-between;
+      //   span {
+      //     // margin-left: 20px;
+      //     font-family: PingFangSC-Regular;
+      //     font-size: 13px;
+      //     color: #4b4a4b;
+      //     letter-spacing: 0;
+      //   }
+      // }
       .time {
         flex: 3;
         height: 85%;
@@ -338,8 +345,10 @@ export default {
         color: #4b4a4b;
         display: flex;
         justify-content: space-between;
+        p:nth-of-type(2){
+          padding-left:10px;
+        }
         p {
-          margin-top: 17px;
           span {
             display: block;
             margin-top: 18px;