"); }, // 订阅个人消息队列 @@ -803,7 +847,7 @@ export default { lastTime: messageData.time, // 直接使用 createTime unread: 1, important: false, - isGuest: messageData.sendUserType === 0, + isGuest: msg.sendUserType === 0, sendUserType: messageData.sendUserType, isManualCreated: true, }; @@ -951,17 +995,16 @@ export default { this.contacts = [...this.contacts, ...uniqueNewContacts]; this.sortContacts(); } - }else{ + } else { this.$message({ - message: this.$t("chat.contactFailed") || "加载更多联系人失败", - type: "error", - duration: 3000, - showClose: true, - }); + message: this.$t("chat.contactFailed") || "加载更多联系人失败", + type: "error", + duration: 3000, + showClose: true, + }); } } catch (error) { console.error("5858", error); - } finally { this.isLoadingMoreContacts = false; } @@ -1181,7 +1224,9 @@ export default { // 获取该聊天室的最新消息时间 const latestMessage = this.messages[room.id]?.[0] || null; - const lastTime = latestMessage ? latestMessage.time : room.lastUserSendTime || room.createTime; + const lastTime = latestMessage + ? latestMessage.time + : room.lastUserSendTime || room.createTime; return { roomId: room.id, @@ -1503,16 +1548,16 @@ export default { this.$message({ message: "正在上传图片...", type: "info" }); // 创建 FormData const formData = new FormData(); - formData.append('file', file); - + formData.append("file", file); + // 上传图片 const response = await this.$axios({ - method: 'post', + method: "post", url: `${process.env.VUE_APP_BASE_API}pool/ticket/uploadFile`, data: formData, headers: { - 'Content-Type': 'multipart/form-data' - } + "Content-Type": "multipart/form-data", + }, }); if (response.data.code === 200) { @@ -1534,10 +1579,11 @@ export default { // 发送图片消息 this.sendImageMessage(imageUrl); - + // 等待图片加载完成后滚动到底部 this.$nextTick(() => { - const img = this.$refs.messageContainer.querySelector('.cs-image img'); + const img = + this.$refs.messageContainer.querySelector(".cs-image img"); if (img) { // 创建一个新的 Promise 来处理图片加载 const imgLoadPromise = new Promise((resolve) => { @@ -1578,7 +1624,7 @@ export default { showClose: true, }); } else { - throw new Error(response.data.msg || '上传失败'); + throw new Error(response.data.msg || "上传失败"); } } catch (error) { console.error("上传图片异常:", error); @@ -1611,9 +1657,8 @@ export default { receiveUserType: this.currentContact.sendUserType || 1, roomId: this.currentContactId, content: imageUrl, // 使用接口返回的url - }; - + this.stompClient.send( "/point/send/message/to/user", {}, @@ -1709,17 +1754,26 @@ export default { // 根据重要性对联系人列表排序 sortContacts() { + + console.log("排序前的联系人列表", this.contacts); this.contacts.sort((a, b) => { // 首先按重要性排序（重要的在前） if (a.important && !b.important) return -1; if (!a.important && b.important) return 1; // 确保日期字符串正确比较 - const aTime = a.lastTime || ''; - const bTime = b.lastTime || ''; + // const aTime = a.lastTime || ""; + // const bTime = b.lastTime || ""; + // console.log("aTime", aTime); + // console.log("bTime", bTime); - // 直接比较时间字符串，因为格式是 "YYYY-MM-DDTHH:mm:ss" - return bTime.localeCompare(aTime); + // 2. 时间倒序（最新在前） + const aTime = a.lastTime ? new Date(a.lastTime).getTime() : 0; + const bTime = b.lastTime ? new Date(b.lastTime).getTime() : 0; + + + return bTime - aTime; + }); }, @@ -1772,19 +1826,21 @@ export default { // 格式化消息时间（只做格式化，不做多余转换） formatTime(date) { if (!date) return ""; - const str = typeof date === 'string' ? date : date.toISOString(); - const [d, t] = str.split('T'); + const str = typeof date === "string" ? date : date.toISOString(); + const [d, t] = str.split("T"); if (!t) return str; - const [hour, minute] = t.split(':'); + const [hour, minute] = t.split(":"); // 取当前UTC日期 const now = new Date(); - const nowUTC = now.toISOString().split('T')[0]; + const nowUTC = now.toISOString().split("T")[0]; const msgUTC = d; if (nowUTC === msgUTC) { return `UTC ${this.$t("chat.today")} ${hour}:${minute}`; } // 判断昨天 - const yesterdayUTC = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString().split('T')[0]; + const yesterdayUTC = new Date(Date.now() - 24 * 60 * 60 * 1000) + .toISOString() + .split("T")[0]; if (yesterdayUTC === msgUTC) { return `UTC ${this.$t("chat.yesterday")} ${hour}:${minute}`; } @@ -1795,12 +1851,12 @@ export default { formatLastTime(date) { if (!date) return ""; // 确保是字符串格式 - const str = typeof date === 'string' ? date : date.toISOString(); + const str = typeof date === "string" ? date : date.toISOString(); // 直接提取时间部分 - const timePart = str.split('T')[1]; + const timePart = str.split("T")[1]; if (!timePart) return str; // 只取小时和分钟 - const [hours, minutes] = timePart.split(':'); + const [hours, minutes] = timePart.split(":"); return `${hours}:${minutes} UTC`; }, @@ -1928,7 +1984,7 @@ export default { if (!this.currentContact) return; this.$refs.imageInput.click(); }, - // 将本地时间转换为 UTC 时间 + // 将本地时间转换为 UTC 时间 convertToUTC(date) { if (!date) return null; const d = new Date(date); @@ -1944,11 +2000,10 @@ export default { // 修正后端返回不带Z的UTC时间字符串 fixToUTC(str) { - if (typeof str !== 'string') return str; - if (str.endsWith('Z') || /[+-]\d{2}:?\d{2}$/.test(str)) return str; - return str + 'Z'; + if (typeof str !== "string") return str; + if (str.endsWith("Z") || /[+-]\d{2}:?\d{2}$/.test(str)) return str; + return str + "Z"; }, - }, beforeDestroy() { diff --git a/mining-pool/src/views/personalCenter/securitySetting/index.vue b/mining-pool/src/views/personalCenter/securitySetting/index.vue index 4a08573..75793a0 100644 --- a/mining-pool/src/views/personalCenter/securitySetting/index.vue +++ b/mining-pool/src/views/personalCenter/securitySetting/index.vue @@ -269,7 +269,7 @@ {{ $t(`personal.verificationCode`) }}
KvyE4lFTWek&X%e11l~3FIj2N1*n3p_C$Q7qfj1z
z4n6V-bIA(4?MG)#wrr=d63e