From a50dde13a152183aed11fe1d089256c0767c4b49 Mon Sep 17 00:00:00 2001
From: zhouxueli <2841188632@qq.com>
Date: Mon, 28 Aug 2023 14:18:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD=E5=AE=8C?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=98=BE=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index/vehicleManage.vue | 51 +++++++++++++++++++++----------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue
index 568cf983..cd5d1dd7 100644
--- a/src/views/index/vehicleManage.vue
+++ b/src/views/index/vehicleManage.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="wrap"  @scroll="handleScroll">
+<div class="wrap"  >
   <div class="navBar">
     <van-nav-bar
         title="车辆管理"
@@ -19,21 +19,29 @@
     </van-nav-bar>
   </div>
   <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-    <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
-      <div class="carCode">
-        <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
-        <div class="twoBtn">
-          <button class="del" @click="deleteItem(item.vehicleId)">删除</button>
-          <button class="revise" @click="updateVehicle(item)">修改</button>
+    <van-list
+        v-model="loading1"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+    >
+      <div class="carItem" v-for="(item,index) in vehicleList" :key="index">
+        <div class="carCode">
+          <div class="codeLeft">{{item.plateNumber}} / {{item.vehicleTypeString}}</div>
+          <div class="twoBtn">
+            <button class="del" @click="deleteItem(item.vehicleId)">删除</button>
+            <button class="revise" @click="updateVehicle(item)">修改</button>
+          </div>
+        </div>
+        <div class="carType">{{ item.serviceName }}</div>
+        <div class="juhe">
+          <span class="zdJuhe">是否参与中道聚合:        </span>
+          <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
         </div>
       </div>
-      <div class="carType">{{ item.serviceName }}</div>
-      <div class="juhe">
-        <span class="zdJuhe">是否参与中道聚合:        </span>
-        <span :class="item.hasPolymerization.code == 0  ? 'isYes' :'isNo'">{{item.hasPolymerization.label}}</span>
-      </div>
-    </div>
-  </van-pull-refresh>
+
+    </van-list>
+ </van-pull-refresh>
 <van-dialog v-model="show" title="确定删除吗" show-cancel-button @confirm="handleConfirm"></van-dialog>
   <div v-if="loading">加载中...</div>
 </div>
@@ -56,12 +64,24 @@ export default {
       total:'',
       loading:false,
       isLoading: false,
+      loading1: false,
+      finished: false
     }
   },
   mounted() {
     this.getVehicleList();
   },
   methods:{
+    async onLoad(){
+      this.pageNum++;
+      await this.getVehicleList()
+      // 加载状态结束
+      this.loading1 = false;
+      // 数据全部加载完成
+      if (this.vehicleList.length >= this.total) {
+        this.finished = true;
+      }
+    },
     onRefresh() {
       this.getVehicleList()
       setTimeout(() => {
@@ -74,7 +94,6 @@ export default {
           pageNum:this.pageNum,
           pageSize:this.pageSize
         })
-        // if(result.code === 200){
           this.total=result.total
           if(this.pageNum == 1){// 第一页直接赋值
             this.vehicleList=result.data;
@@ -83,7 +102,6 @@ export default {
             let arr = result.data;
             this.vehicleList = preList.concat(arr)
           }
-        // }
       },
     deleteItem(id){//删除车辆
         this.show=true
@@ -112,6 +130,7 @@ export default {
       let num =  Math.ceil( this.total / 10)
       if(num <= this.pageNum){
         // console.log("不在加载数据")
+
       }else{
         this.pageNum++;
         await this.getVehicleList()