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 | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 94e76ef..f9bbe7d 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -7,7 +7,7 @@
:before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
<div class="notice-content" v-loading="loading">
<el-button size="small" type="primary" @click="handleDropdownAll(1)" style="margin-bottom: 10px;margin-left: 330px;">鍏ㄩ儴宸茶</el-button>
- <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);" v-if="list.length>1||loading">
+ <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list" style="height: calc(100% - 50px);">
<div
class="notice-content-item"
v-for="(m,i) in list"
@@ -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>
@@ -24,7 +27,7 @@
</div>
</div>
</scroll-pagination>
- <!-- <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >鏆傛棤鏁版嵁</div> -->
+ <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >鏆傛棤鏁版嵁</div>
</div>
</el-drawer>
</div>
@@ -70,22 +73,7 @@
value:4
},
],
- list:[
- // {
- // messageType:1,
- // theme:'娴嬭瘯鏍囬',
- // createTime: '2019-08-30 15:46:17',
- // createUser:'<USERNAME>',
- // viewStatus:false,
- // },
- // {
- // messageType:2,
- // theme:'娴嬭瘯鏍囬',
- // createTime: '2019-08-30 15:46:17',
- // createUser:'<USERNAME>',
- // viewStatus:true,
- // },
- ],
+ list:[],
currentPage:1,
pageSize: 8, // 涓�椤�7鏉�
total: null,
@@ -243,6 +231,7 @@
>>>.el-drawer__header {
color: #303133;
+ text-align: left;
}
>>>.el-drawer__body{
height: calc(100vh - 82px);
@@ -301,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