From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/index.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 32818b0..51f20e9 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -43,6 +43,9 @@
</div>
<i class="el-icon-arrow-right"></i>
</div>
+ <div class="list_item1"></div>
+ <div class="list_item1"></div>
+ <div class="list_item1"></div>
</div>
</div>
</div>
@@ -75,14 +78,14 @@
</div>
<div class="main_right_rc">
<div class="main_right_rc_title">褰撴棩鏃ョ▼锛坽{dataList.length}}锛�</div>
- <div class="main_right_rc_list">
+ <div class="main_right_rc_list" v-loading="loading">
<div class="main_right_rc_list_row" v-for="(item, index) in dataList" :key="index">
<div class="top">
<div class="top_left">
<div class="top_left_dian"></div>
<div class="top_left_title">{{item.title}}</div>
</div>
- <div class="top_date">{{item.createDate}}</div>
+ <div class="top_date">{{item.param1}}</div>
</div>
<div class="bottom">
{{item.content}}
@@ -109,7 +112,8 @@
nian: '',
yue: '',
obj: {},
- dataList: []
+ dataList: [],
+ loading: false
}
},
components: { CommonFunctions, Calendar },
@@ -137,6 +141,7 @@
})
},
clickDay(e) {
+ this.loading = true
let date = e.replace("/\\//g", "-")
let arr = this.markDateMore.filter(item => {
if (item.date === date) {
@@ -148,6 +153,7 @@
} else {
this.dataList = []
}
+ this.loading = false
},
// 鑾峰彇鏃ョ▼
getMonthNoticess() {
@@ -307,6 +313,10 @@
align-items: center;
flex-wrap: wrap;
justify-content: space-between;
+ .list_item1 {
+ width: 24%;
+ height: 0;
+ }
.list_item {
cursor: pointer;
width: 24%;
@@ -435,8 +445,8 @@
max-width: 100%;
}
::v-deep .wh_content_item .wh_isToday {
- background-color: #3E80EF;
- color: #fff;
+ background-color: rgba(62, 128, 239, 0.47);
+ color: #ffffff;
}
::v-deep .wh_item_date:hover {
background-color: #3E80EF;
--
Gitblit v1.9.3