From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/view/notice.vue | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/view/notice.vue b/src/view/notice.vue
index bb0eaf4..f9bbe7d 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -16,7 +16,10 @@
@click="goNoticeDetail(m)">
<img :src="`../../static/img/notice-${m.viewStatus?1:0}-${m.messageType}.svg`" alt="" style="margin-right: 6px;">
<div class="notice-content-item-left">
- <p>{{ m.theme }}</p>
+ <p style="display: flex;justify-content: space-between;">
+ <span>{{ m.theme }}</span>
+ <i class="el-icon-delete" style="cursor: pointer;font-size: 16px;margin-right: 20px;" @click.stop="handleDel(m)"></i>
+ </p>
<p style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
<span>鍙戦�佷汉锛歿{ m.createUser }}</span>
<span>{{ m.createTime }}</span>
@@ -287,4 +290,10 @@
.readStyle .notice-content-item-left p:nth-child(2){
color: #90CBCD;
}
+.el-icon-delete{
+ display: none;
+}
+.notice-content-item:hover .el-icon-delete{
+ display: inline-block;
+}
</style>
--
Gitblit v1.9.3