Merge branch 'liuxin' into develop

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

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

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

@@ -72,7 +72,7 @@ export default {
     },
   },
   activated () {
-    this.money = this.pay_rent
+    // this.money = this.pay_rent
   },
   methods: {
     getRent () {

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

@@ -68,8 +68,14 @@ export default {
   },
   computed: {},
   watch: {},
-  activated () {
-    this.money = this.$route.params.sumMoney
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'PaymentFirstPay') {
+        vm.money = vm.$route.params.money
+      } else if (from.name === 'PaymentContractRecord') {
+        vm.money = vm.$route.params.sumMoney
+      }
+    })
   },
   methods: {
     isSelect (way) {