From 9b64834a1c7b27cd857080279630a39ddb4b929d Mon Sep 17 00:00:00 2001
From: dongzhihuan <dongzhihuan@honeycombis.com>
Date: Wed, 7 Jan 2026 17:18:06 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/message/index.ts              | 2 +-
 src/spdm/api/request.ts               | 7 ++++---
 src/views/message/components/list.vue | 8 ++++----
 src/views/message/records.vue         | 2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/api/message/index.ts b/src/api/message/index.ts
index c4c1ac6..a71082c 100644
--- a/src/api/message/index.ts
+++ b/src/api/message/index.ts
@@ -176,7 +176,7 @@ export const deleteMessageList = (id: string) => {
 };
 
 // 用户消息 /msg/message/list/user/page
-export const getMessageUserPage = (params: { size: number; current: number; msgCategory?: string; isRead?: string }) => {
+export const getMessageUserPage = (params: { size: number; current: number; msgCategory?: string; isRead?: string, userId?: string; }) => {
 	return request.get('/msg/message/list/user/page', { params });
 };
 // 修改消息状态 /msg/message/list/item/isRead
diff --git a/src/spdm/api/request.ts b/src/spdm/api/request.ts
index ed20dd7..685a408 100644
--- a/src/spdm/api/request.ts
+++ b/src/spdm/api/request.ts
@@ -1,10 +1,11 @@
 import axios from 'axios';
 import { ElMessage } from 'element-plus';
 import { BASE_URL } from '../config';
+import Cookies from 'js-cookie';
 
-let userId = localStorage.getItem('USER_ID') || '';
-let token =  localStorage.getItem('TOKEN') || '';
-let tenantId = localStorage.getItem('TENANT_ID') || '';
+let userId = Cookies.get('cid_user_id');
+let token =  Cookies.get('cid_token');
+let tenantId = Cookies.get('cid_tenant_id');
 
 const service = axios.create({
   baseURL: BASE_URL,
diff --git a/src/views/message/components/list.vue b/src/views/message/components/list.vue
index 750b6d6..efa3ced 100644
--- a/src/views/message/components/list.vue
+++ b/src/views/message/components/list.vue
@@ -7,7 +7,7 @@
 			</div>
 		</template>
 		<div>
-			<ul class="infinite-list" v-infinite-scroll="getUserMessage">
+			<ul v-infinite-scroll="getUserMessage" class="infinite-list">
 				<li
 					v-for="(item, index) in messageList"
 					:key="item.id"
@@ -21,7 +21,7 @@
 						</div>
 						<div class="h-8 flex justify-between items-center">
 							<span class="w-60 overflow-hidden text-ellipsis whitespace-nowrap">{{ item.msgBody }}</span>
-							<div class="min-w-28" v-if="item.isRead === 0 && item.msgCategory !== 0">
+							<div v-if="item.isRead === 0 && item.msgCategory !== 0" class="min-w-28">
 								<el-button type="primary" size="small" round @click.stop="viewMessage(item, MessageRead.READ, index)">{{ $t('form.DeliverableObjectSelect.09123355-3') }}</el-button>
 								<el-button type="default" size="small" round @click.stop="viewMessage(item, MessageRead.IGNORE, index)">{{ $t('Crontab.index.7634731-37') }}</el-button>
 							</div>
@@ -40,7 +40,7 @@
 <script setup lang="ts" name="newsList">
 import {isReadAll, getMessageUserPage, editMessageUserIsRead, MessageUserVo, taskAdjust, MessageRead, MessageCategory} from '/@/api/message/index';
 import {useMsg} from '/@/stores/msg';
-
+import Cookies from 'js-cookie';
 const router = useRouter();
 const visible = ref(false);
 const pageSize = ref(10);
@@ -70,7 +70,7 @@ const getUserMessage = async () => {
 	if (isFinish.value) {
 		return;
 	}
-	const res = await getMessageUserPage({size: pageSize.value, current: current.value, msgCategory: '', isRead: '0'});
+	const res = await getMessageUserPage({size: pageSize.value, current: current.value, msgCategory: '', isRead: '0', userId: Cookies.get('cid_user_id')});
 	messageList.value.push(...res.data.records);
 	if (res.data.records.length < pageSize.value) {
 		isFinish.value = true;
diff --git a/src/views/message/records.vue b/src/views/message/records.vue
index 43f46f7..15453c8 100644
--- a/src/views/message/records.vue
+++ b/src/views/message/records.vue
@@ -29,6 +29,7 @@ import {getMessageUserPage, editMessageUserIsRead, isReadAll, MessageUserVo, tas
 import {useMsg} from '/@/stores/msg';
 import RecordItem from './components/RecordItem.vue';
 import { useRoute } from 'vue-router';
+import Cookies from 'js-cookie';
 
 const activeName = ref<string>('');
 
@@ -74,6 +75,7 @@ const getUserMessage = async () => {
     current: current.value,
     msgCategory: activeName.value,
     isRead: '',
+    userId: Cookies.get('cid_user_id'),
   };
   // SPDM CODE
   if (spdmMsgType.value) {