样品单和合同增加totaltotalElements

src/app/contract-table/contract-table.page.ts

@@ -12,6 +12,7 @@ export class ContractTablePage implements OnInit {
 
   defaultHref=""
   contractList=[]
+  total = 0
   queryForm = {}
   constructor(private router: Router,
     public userData: UserData,
@@ -28,7 +29,9 @@ export class ContractTablePage implements OnInit {
     this.storage.get('contractForm').then(async (val) => {
       if (val) {
         this.queryForm = val
-        this.contractList = await this.userData.getContractTableData(this.queryForm)
+        let data = await this.userData.getContractTableData(this.queryForm)
+        this.total = data.totalElements
+        this.contractList = data.data
       }
     });
   }
@@ -40,9 +43,11 @@ export class ContractTablePage implements OnInit {
 
   async loadData(event) {
     this.queryForm['size'] += 10
-    this.contractList = await this.userData.getContractTableData(this.queryForm)
+    let data = await this.userData.getContractTableData(this.queryForm)
+    this.total = data.totalElements
+    this.contractList = data.data
     event.target.complete();
-    if (this.contractList.length < this.queryForm['size']) {
+    if (this.total < this.queryForm['size']) {
       event.target.disabled = true;
     }
   }

src/app/sample-table/sample-table.page.ts

@@ -12,6 +12,7 @@ export class SampleTablePage implements OnInit {
   constructor(private router: Router, private storage: Storage, public userData: UserData ) { }
   sampleList = []
   defaultHref = '';
+  total = 0
   queryForm = {}
   ngOnInit() {
     this.getTableData()
@@ -24,7 +25,9 @@ export class SampleTablePage implements OnInit {
     this.storage.get('sampleForm').then(async (val) => {
       if (val) {
         this.queryForm = val
-        this.sampleList = await this.userData.getSampleTableData(this.queryForm)
+        let data = await this.userData.getSampleTableData(this.queryForm)
+        this.sampleList = data.data
+        this.total = data.totalElements
       }
     });
   }
@@ -34,9 +37,11 @@ export class SampleTablePage implements OnInit {
   }
   async loadData(event) {
     this.queryForm['size'] += 10
-    this.sampleList = await this.userData.getSampleTableData(this.queryForm)
+    let data = await this.userData.getSampleTableData(this.queryForm)
+    this.sampleList = data.data
+    this.total = data.totalElements
     event.target.complete();
-    if (this.sampleList.length < this.queryForm['size']) {
+    if (this.total < this.queryForm['size']) {
       event.target.disabled = true;
     }
   }

src/providers/user-data.ts

@@ -7,7 +7,7 @@ import { Router } from '@angular/router';
 import { AlertController } from '@ionic/angular';
 import { finalize } from 'rxjs/operators';
 import { queryForm } from './query';
-import { environment } from '../environments/environment';
+import { environment } from '../environments/environment.prod';
 
 
 @Injectable({
@@ -273,7 +273,7 @@ export class UserData {
             await toast.present();
             reject()
           } else if (JSON.parse(data.data).code == 0) {
-            resolve(JSON.parse(data.data).data)
+            resolve(JSON.parse(data.data))
           }
           // this.storage.set('sample-table-data', data.data);
           // this.router.navigateByUrl('/sample-table');
@@ -312,7 +312,7 @@ export class UserData {
             await toast.present();
             reject()
           } else if (JSON.parse(data.data).code == 0) {
-            resolve(JSON.parse(data.data).data)
+            resolve(JSON.parse(data.data))
           }
         }, async err => {
           console.log(err);