Merge branch 'liuxin' into develop

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

@@ -165,7 +165,7 @@ export default {
   },
 }
 </script>
-<style lang='less'>
+<style lang='less' >
 #contract-record {
   .h-header {
     background-color: #00469C;

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

@@ -12,7 +12,10 @@
         <div><span>￥</span>{{ sumMoney |currency }}</div>
       </div>
     </div>
-    <h-content class="pay-content">
+    <h-content v-if="info.length===0" class="none">
+      <p>暂无数据</p>
+    </h-content>
+    <h-content v-if="info.length!==0" class="pay-content">
       <div class="search">
         <img src="@/assets/payment/search.png" alt="">
         <input type="text" placeholder="请输入合同号/车架号/承租人名称">
@@ -50,7 +53,7 @@
           <span slot="content">{{ money|currency }}</span>
         </item>
     </list-item></h-content>
-    <div class="prompt">
+    <div v-if="info.length!==0" class="prompt">
       <div><img src="@/assets/payment/prompt.png" alt=""></div>
       <div>
         <p>温馨提示</p>
@@ -58,7 +61,7 @@
         <p>由于存在款项到账时差性，“已还金额”字段可能XXX，给您造成的不便，请谅解，谢谢！</p>
       </div>
     </div>
-    <bottom-tab>
+    <bottom-tab v-if="info.length!==0">
       <tab-button class="footer" @click.native="payDetail()">
         支&nbsp;&nbsp;付
       </tab-button>
@@ -191,6 +194,11 @@ export default {
 </script>
 <style lang='less' >
 #payment-contract-record {
+    .none{
+    display:flex;
+    justify-content: center;
+    align-items: center;
+  }
   .h-header {
     background-color: #00469C;
     .h-header-btn {

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

@@ -17,7 +17,7 @@
         <div class="pay-icon"><img src="@/assets/payment/first-pay.png" alt="">租金支付</div>
         <div class="pay-input">
           <span>应还租金</span>
-          <p>{{ pay_rent |currency }}</p>
+          <input v-model="pay_rent" type="text" placeholder="请输入支付金额">
           <div @click="createOrder"><i class="icon ion-ios-arrow-right"/></div>
         </div>
       </div>
@@ -64,7 +64,7 @@ export default {
   },
   computed: {},
   watch: {
-    'liquidated_damages': {
+    'pay_rent': {
       handler () {
         this.money = parseFloat(parseFloat(this.pay_rent) + parseFloat(this.liquidated_damages))
       },
@@ -130,11 +130,11 @@ export default {
         }
       })
     },
-    toPayEntry (money) {
+    toPayEntry () {
       this.$router.push({
         name: 'PaymentPayEntry',
         params: {
-          money,
+          money: this.money,
         },
       })
     },