From fd3913814e7b50d654c1e133058f49cbf83240eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E7=8E=89=E5=BC=BA?= <875626088@qq.com>
Date: Thu, 26 Oct 2023 14:49:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json               |  2 +-
 src/views/notice/index.vue | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index de27006..9749ef6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vue-admin",
 	"private": true,
-	"version": "1.3.1",
+	"version": "1.3.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite",
diff --git a/src/views/notice/index.vue b/src/views/notice/index.vue
index 1f53d98..7d08c58 100644
--- a/src/views/notice/index.vue
+++ b/src/views/notice/index.vue
@@ -33,13 +33,16 @@
                 </el-table-column>
                 <el-table-column label="操作" width="120">
                     <template #default="scope">
+                        <el-button type="success" size="small" icon="ChatDotSquare"
+                            v-if="scope.row.typefirst != 1 || scope.row.typesecond != 1" :disabled="scope.row.isdeal == 1"
+                            @click="readerHandle(scope.row)">已读</el-button>
                         <el-link :href="scope.row.url" target="_blank" :underline="false" v-if="scope.row.url">
-                            <el-button type="primary" size="small" icon="Link"
+                            <el-button type="warning" size="small" icon="Link"
                                 @click="readerHandle(scope.row)">跳转</el-button>
                         </el-link>
                         <RouterLink :to="{ name: 'shop_detail', query: { id: scope.row.userid, type: 'msg1' } }"
                             v-if="scope.row.typefirst == 1 && scope.row.typesecond == 1">
-                            <el-button type="primary" size="small" icon="Link"
+                            <el-button type="primary" size="small" icon="Edit"
                                 @click="readerHandle(scope.row)">处理</el-button>
                         </RouterLink>
                     </template>
@@ -94,10 +97,11 @@ async function getNoticesAjax() {
 
 // 已读消息
 function readerHandle(item) {
+    console.log(item)
     if (!item.isdeal) {
         unread({ noticecode: item.noticecode })
+        paginationChange()
     }
-    paginationChange()
 }
 
 onMounted(() => {
@@ -107,6 +111,6 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .table {
-    height: calc(100vh - 263px);
+    height: calc(100vh - 218px);
 }
 </style>
\ No newline at end of file