From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/view/notice.vue | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 00bc85e..71a978f 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -6,7 +6,8 @@
:direction="direction"
:before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
<div class="notice-content" v-loading="loading">
- <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list">
+ <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);">
<div
class="notice-content-item"
v-for="(m,i) in list"
@@ -23,7 +24,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>
@@ -69,22 +70,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,
@@ -221,6 +207,7 @@
this.keyMap = {};
this.currentPage = 1;
this.refresh();
+ this.$emit('goNoticeDetail')
})
}
},
--
Gitblit v1.9.3