Merge branch 'ren' into develop

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-22 10:28:20
+ * @LastEditTime: 2019-11-22 16:17:31
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -52,35 +52,42 @@
 
       </list-item>
       <div class="header">设备清单</div>
-      <list-item :item-height="104" class="equipment-list">
-        <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
-          <div slot="name" class="parameters">
-            <div class="list">
-              <p>参数项</p>
-              <span class="bold">{{ item.product_code }}</span>
+      <scroll
+        ref="scroll"
+        :updateData="[lists]"
+        :pullUp="true"
+        @pullingUp="loadMore">
+        <list-item :item-height="104" class="equipment-list">
+          <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
+            <div slot="name" class="parameters">
+              <div class="list">
+                <p>参数项</p>
+                <span class="bold">{{ item.product_code }}</span>
+              </div>
+              <div class="list">
+                <p>发动机号</p>
+                <span>{{ item.lease_item_engine_num }}</span>
+              </div>
+              <div class="list">
+                <p>车辆型号</p>
+                <span>{{ item.vehicle_model }}</span>
+              </div>
+              <div class="list">
+                <p>合格证编号</p>
+                <span>{{ item.certificate_number }}</span>
+              </div>
             </div>
-            <div class="list">
-              <p>发动机号</p>
-              <span>{{ item.lease_item_engine_num }}</span>
+            <div slot="content">
+              <span v-if="item.overdue_times != 0" :class="['status','red']">逾期{{ item.overdue_times }}期</span>
+              <div class="plan" @click="toRepayPlans(item.contract_id)">
+                <img src="@/assets/contractRepayment/plan.png" alt="">
+                <span>还款计划</span>
+              </div>
             </div>
-            <div class="list">
-              <p>车辆型号</p>
-              <span>{{ item.vehicle_model }}</span>
-            </div>
-            <div class="list">
-              <p>合格证编号</p>
-              <span>{{ item.certificate_number }}</span>
-            </div>
-          </div>
-          <div slot="content">
-            <span v-if="item.overdue_times != 0" :class="['status','red']">逾期{{ item.overdue_times }}期</span>
-            <div class="plan" @click="toRepayPlans(item.contract_id)">
-              <img src="@/assets/contractRepayment/plan.png" alt="">
-              <span>还款计划</span>
-            </div>
-          </div>
-        </item>
-      </list-item>
+          </item>
+        </list-item>
+      </scroll>
+
     </h-content>
 
   </h-view>
@@ -95,6 +102,7 @@ export default {
   data () {
     return {
       lists: [],
+      pagenum: 1,
       detailInfo: {},
     }
   },
@@ -105,6 +113,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'ContractRecords') {
+        vm.pagenum = 1
         vm.detailQuery()
         vm.equipQuery()
       }
@@ -143,6 +152,8 @@ export default {
       let vm = this
       let url = $config.basePath + 'con_equip_list'
       let param = {
+        pagesize: 10,
+        pagenum: vm.pagenum,
         project_id: vm.$route.params.project_id,
       }
       vm.hlsPopup.showLoading('数据加载中')
@@ -150,6 +161,44 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
+          if (res.lists.length >= 0 && res.lists.length < 10) {
+            vm.$refs.scroll.update(true)
+          } else if (res.lists.length === 10) {
+            vm.$refs.scroll.update(false)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    loadMore () {
+      let vm = this
+      let url = $config.basePath + 'con_equip_list'
+      vm.pagenum++
+      let param = {
+        pagesize: 10,
+        pagenum: vm.pagenum,
+        project_id: vm.$route.params.project_id,
+      }
+      vm.hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.lists.push(array[index])
+            })
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.lists.push(array[index])
+            })
+            vm.$refs.scroll.update(false)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }