From 2d5090c2b215a5ea7e489d4b50fbf30aae569324 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期五, 26 七月 2024 15:03:01 +0800
Subject: [PATCH] fix bug 接口对接和样式调整
---
mixin/mixin.js | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/mixin/mixin.js b/mixin/mixin.js
index 9da88ef..c119261 100644
--- a/mixin/mixin.js
+++ b/mixin/mixin.js
@@ -278,22 +278,28 @@
}
})
if (data) {
- if (this.page.current === 1) {
- this.list = data.records || []
+ if (data && Array.isArray(data)) {
+ this.list = data || []
+ this.page.total = data.length || 0
} else {
- //根据id去重正常
- var ids = []
- for (var item of this.list) {
- ids.push(item.id)
- }
- for (var item of data.records) {
- if (ids.indexOf(item.id) < 0) {
- this.list.push(item)
+ if (this.page.current === 1) {
+ this.list = data.records || []
+ } else {
+ //根据id去重正常
+ var ids = []
+ for (var item of this.list) {
+ ids.push(item.id)
}
- }
+ for (var item of data.records) {
+ if (ids.indexOf(item.id) < 0) {
+ this.list.push(item)
+ }
+ }
+ }
+ this.page.total = data.total || 0
}
- this.page.total = data.total || 0
+
if (this.getList_after) {
this.getList_after()
}
--
Gitblit v1.9.3