From 67d2338b3dd43c5972159822aa3dd8f53cd3c78b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 四月 2024 11:14:00 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/a6-device-overview.vue | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/components/view/a6-device-overview.vue b/src/components/view/a6-device-overview.vue
index d330033..9b0b5b4 100644
--- a/src/components/view/a6-device-overview.vue
+++ b/src/components/view/a6-device-overview.vue
@@ -42,6 +42,7 @@
grid-template-columns: repeat(auto-fit, 375px);
/* justify-content: center; */
grid-gap: 16px;
+ min-height: 300px;
}
.card li{
width: 375px;
@@ -287,6 +288,9 @@
this.finishLoding = true;
}
this.list = this.list.concat(list)
+ if(this.total==this.list.length){
+ this.finishLoding = true;
+ }
}
}
this.loading = false
--
Gitblit v1.9.3