翻页

src/views/myHistoryTest/myHistoryTest.html

@@ -27,14 +27,11 @@
     </div>
   </div>
   <!-- 列表 -->
-  <div class="test-list" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
-    <div class="item" v-for="(item,index) in pageModel.resultSet" :key="item.created"
-      :class="{ itemCopy: isCopy && index == 0 }">
-      <!-- <img  mode="" :src="" alt=""> -->
+  <div class="test-list" v-infinite-scroll="getTestList" infinite-scroll-disabled="disabled">
+    <div class="item" v-for="(item,index) in dataList" :key="item.created" :class="{ itemCopy: isCopy && index == 0 }">
       <el-image class="item-img" :src="item.coverImg" fit="cover">
         <div slot="error" class="outline">
           <img class="item-img-outline" src="../../assets/images/picture-error.png" alt="">
-          <!-- <i class="el-icon-picture-outline"></i> -->
         </div>
       </el-image>
       <div class="tools">
@@ -58,5 +55,5 @@
   <div v-if="loading" class="loading">加载中...</div>
   <div v-if="noMore" class="loading">没有更多了</div>
   <!-- 分享设置 -->
-  <ShareSetting v-if="isShareSetting" :close="closeShare" :shareModel="shareModel"></ShareSetting>
+  <!-- <ShareSetting v-if="isShareSetting" :close="closeShare" :shareModel="shareModel"></ShareSetting> -->
 </div>

src/views/myHistoryTest/myHistoryTest.js

@@ -38,15 +38,19 @@ export default {
       orderList: [{ orderName: "按创建时间排序", orderType: "created" }, { orderName: "按更新时间排序", orderType: "updated" }],
       currOrderName: "更新时间",
       currOrderType: "",
-      shareModel: ""
+      shareModel: "",
+      pageNo: 1,
+      dataList: [],
+      rowTotal: 0
     }
   },
   computed: {
     noMore() {
-      return this.pageModel.count == this.pageModel.total && this.pageModel.total > 1
+      console.log(this.rowTotal, this.dataList.length);
+      return this.rowTotal === this.dataList.length;
     },
     disabled() {
-      return this.loading || this.pageModel.count == this.pageModel.total
+      return this.loading || this.noMore;
     }
   },
   watch: {
@@ -67,26 +71,27 @@ export default {
         this.houseList = res.list;
       }
     });
-    this.getTestList(true);
+    this.getTestList();
   },
   methods: {
     dataformat(val) {
       return timeFormat.dateStr(val);
     },
-    load() {
-      this.getTestList(false);
-    },
-    getTestList(isFirst) {
-      this.loading = !isFirst
+    getTestList() {
+      this.loading = true
+      console.log("XXXXXSS");
       let data = {
         "orderType": this.currOrderType,
-        "ownHouseName": this.ownHouseName == "所属项目" ? '' : this.ownHouseName,
-        "pageNo": isFirst ? 0 : this.pageModel.count + 1,
+        "houseNameList": this.ownHouseName == "所属项目" ? '' : this.ownHouseName,
+        "pageNo": this.pageNo++,
+        "pageSize": 4
       }
       api.testList(data).then((res) => {
         if (res.success) {
           this.pageModel = res.pageModel;
-          console.log("success", this.pageModel);
+          this.dataList.push(...this.pageModel.resultSet);
+          console.log("success", this.dataList);
+          this.rowTotal = res.pageModel.rowTotal;
         } else {
           console.log("error");
         }