xuqiang před 4 roky
rodič
revize
3bc7ed5e03

+ 13 - 8
src/main/pc-space/src/mixins/list.js

@@ -19,8 +19,8 @@ export default {
             }
 
             this.loading = true;
-            this.finished = false;
-            this.empty = false;
+            // this.finished = false;
+            // this.empty = false;
             let data = { page: this.page, size: 20, sort: 'createdAt,desc' };
             if (this.beforeData) {
                 data = {
@@ -30,13 +30,18 @@ export default {
             }
 
             this.$http.post(this.url, data, { body: 'json' }).then(res => {
-                this.list = [...this.list, ...res.content];
-                this.empty = res.empty;
-                this.loading = false;
-                this.finished = res.last;
-                if (!this.finished) {
-                    this.page = this.page + 1;
+                if (this.setList) {
+                    this.setList(res.content);
                 }
+                this.totalPages = res.totalPages;
+                this.totalElements = res.totalElements;
+                // this.list = [...this.list, ...res.content];
+                // this.empty = res.empty;
+                this.loading = false;
+                // this.finished = res.last;
+                // if (!this.finished) {
+                //     this.page = this.page + 1;
+                // }
             });
         },
         onSearch() {

+ 3 - 2
src/main/pc-space/src/views/user/MyLikes.vue

@@ -105,12 +105,10 @@ export default {
                 })
                 .catch(() => {});
             this.getData();
-            this.tableData = this.list;
         }
     },
     mounted() {
         this.getData();
-        this.tableData = this.list;
     },
     methods: {
         beforeData() {
@@ -122,6 +120,9 @@ export default {
                 }
             };
         },
+        setList(list) {
+            this.tableData = list;
+        },
         handleClick(row) {
             this.$confirm('确定删除该订单吗?', '警告', {
                 confirmButtonText: '确定',

+ 3 - 1
src/main/pc-space/src/views/user/OrderValue.vue

@@ -66,7 +66,6 @@ export default {
     },
     mounted() {
         this.getData();
-        this.tableData = this.list;
     },
     methods: {
         beforeData() {
@@ -76,6 +75,9 @@ export default {
                     userId: this.userInfo.id
                 }
             };
+        },
+        setList(list) {
+            this.tableData = list;
         }
     }
 };

+ 3 - 1
src/main/pc-space/src/views/user/PayRecord.vue

@@ -72,7 +72,6 @@ export default {
     },
     mounted() {
         this.getData();
-        this.tableData = this.list;
     },
     methods: {
         beforeData() {
@@ -83,6 +82,9 @@ export default {
                 }
             };
         },
+        setList(list) {
+            this.tableData = list;
+        },
         handleClick(row) {
             this.$confirm('确定删除该订单吗?', '警告', {
                 confirmButtonText: '确定',

+ 3 - 1
src/main/pc-space/src/views/user/TransactionOrdes.vue

@@ -72,7 +72,6 @@ export default {
     },
     mounted() {
         this.getData();
-        this.tableData = this.list;
     },
     methods: {
         beforeData() {
@@ -83,6 +82,9 @@ export default {
                 }
             };
         },
+        setList(list) {
+            this.tableData = list;
+        },
         handleClick(row) {
             this.$confirm('确定删除该订单吗?', '警告', {
                 confirmButtonText: '确定',