XingQue/a_long
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复消息监听角标、历史记录加载与重复订单卡片推送

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-06-24 04:17:33 +08:00
parent 53548b6a61
commit 29b8f303b3
4 changed files with 360 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
miniprogram/pages/qunliaotian/qunliaotian.js
View File

@@ -2,7 +2,8 @@ const app = getApp();
import { formatDate } from '../../static/lib/utils';
import { sendGroupMessage } from '../../utils/message-sender';
import { showConfirmByScene } from '../../utils/scriptService.js';
import { normalizeGroupMessage } from '../../utils/group-chat.js';
import { normalizeGroupMessage, getZhuangtaiText } from '../../utils/group-chat.js';
import { persistGroupMeta } from '../../utils/im-user.js';
import { getFreshImUser } from '../../utils/im-user.js';
Page({
@@ -12,6 +13,10 @@ Page({
groupAvatar: '',
orderId: '',
isCross: 0,
orderZhuangtai: null,
orderZhuangtaiText: '',
orderJine: '',
orderJieshao: '',
currentUser: null,
messages: [],
inputText: '',
@@ -61,49 +66,124 @@ Page({
} else {
this.initCurrentUser();
}
},
/*onLoad(options) {
if (options.data) {
try {
const p = JSON.parse(decodeURIComponent(options.data));
this.setData({
groupId: p.groupId || '',
groupName: p.groupName || '订单群聊',
groupAvatar: p.groupAvatar || '',
orderId: p.orderId || '',
isCross: p.isCross || 0
});
} catch (e) {}
const meta = (app.globalData.groupInfoMap && app.globalData.groupInfoMap[p.groupId]) || {};
const initZt = p.orderZhuangtai != null ? p.orderZhuangtai : meta.orderZhuangtai;
if (initZt != null) {
this.applyOrderStatus(initZt, {
orderId: p.orderId || meta.orderId,
jine: p.orderJine || meta.orderJine,
jieshao: p.orderDesc || meta.orderDesc,
});
}
wx.setNavigationBarTitle({ title: this.data.groupName });
this.initCurrentUser();
},*/
},
onShow() {
app.globalData.pageState.isInChatPage = true;
app.globalData.pageState.currentChatId = this.data.groupId;
app.globalData.pageState.isInGroupChat = true;
this.ensureChatConnection();
},
onHide() {
app.globalData.pageState.isInChatPage = false;
app.globalData.pageState.currentChatId = '';
app.globalData.pageState.isInGroupChat = false;
this.clearPageListeners();
},
applyOrderStatus(zhuangtai, extra) {
if (zhuangtai == null && zhuangtai !== 0) return;
const patch = {
orderZhuangtai: zhuangtai,
orderZhuangtaiText: getZhuangtaiText(zhuangtai),
};
if (extra) {
if (extra.jine) patch.orderJine = extra.jine;
if (extra.jieshao) patch.orderJieshao = extra.jieshao;
if (extra.orderId) patch.orderId = extra.orderId;
}
this.setData(patch);
const groupId = this.data.groupId;
if (!groupId) return;
if (!app.globalData.groupInfoMap) app.globalData.groupInfoMap = {};
const meta = { ...(app.globalData.groupInfoMap[groupId] || {}), orderZhuangtai: zhuangtai };
if (extra && extra.orderId) meta.orderId = extra.orderId;
app.globalData.groupInfoMap[groupId] = meta;
persistGroupMeta(app, groupId, meta);
},
applyOrderCardPayload(payload) {
if (!payload) return;
const cardOrderId = payload.orderId || payload.dingdan_id;
if (cardOrderId && this.data.orderId && cardOrderId !== this.data.orderId) return;
const zt = payload.zhuangtai != null ? payload.zhuangtai : this.data.orderZhuangtai;
payload.zhuangtaiText = getZhuangtaiText(zt);
this.applyOrderStatus(zt, {
orderId: payload.orderId || payload.dingdan_id || this.data.orderId,
jine: payload.jine,
jieshao: payload.jieshao,
});
this.updateOrderBubblesInList(payload);
},
updateOrderBubblesInList(payload) {
if (!payload) return;
const orderId = payload.orderId || payload.dingdan_id;
if (!orderId) return;
const messages = this.data.messages.map((m) => {
if (m.type !== 'order' || !m.payload) return m;
const oid = m.payload.orderId || m.payload.dingdan_id;
if (oid !== orderId) return m;
return { ...m, payload: { ...m.payload, ...payload, orderId: oid } };
});
this.setData({ messages });
},
mergeServerMessage(localId, status, serverMsg) {
if (!serverMsg) {
this.updateMsg(localId, status);
return;
}
normalizeGroupMessage(serverMsg);
serverMsg.formattedTime = formatDate(serverMsg.timestamp);
if (serverMsg.type === 'order') {
this.applyOrderCardPayload(serverMsg.payload);
}
const msgs = this.data.messages.map((m) => {
if (m.messageId !== localId) return m;
return {
...serverMsg,
showTime: m.showTime,
status: status || 'success',
formattedTime: serverMsg.formattedTime || m.formattedTime,
};
});
this.setData({ messages: msgs });
},
ensureChatConnection() {
const role = app.globalData.currentRole || 'normal';
const uid = wx.getStorageSync('uid');
const prefixMap = { normal:'Boss', dashou:'Ds', shangjia:'Sj', guanshi:'Gs', zuzhang:'Zz' };
const targetUserId = (prefixMap[role] || 'Boss') + uid;
const pageUserId = this.data.currentUser?.id;
const targetUserId = pageUserId || (prefixMap[role] || 'Boss') + uid;
const onReady = () => {
this.subscribeGroupIfNeeded();
this.setupAllListeners();
this.loadHistory(true).then(() => this.markGroupMessageAsRead());
this.subscribeGroupIfNeeded()
.then(() => {
this.setupAllListeners();
return this.loadHistory(true);
})
.then(() => this.markGroupMessageAsRead());
};
const connectedId = app.globalData?.goEasyConnection?.userId || wx.goEasy?.im?.userId;
const status = wx.goEasy?.getConnectionStatus?.() || 'disconnected';
const currentUserId = wx.goEasy?.im?.userId;
const imOk = status === 'connected' || status === 'reconnected';
if ((status === 'connected' || status === 'reconnected') && currentUserId === targetUserId) {
if (imOk && connectedId === targetUserId) {
onReady();
return;
}
@@ -132,15 +212,19 @@ Page({
avatar: currentUser.avatar || (app.globalData.ossImageUrl + app.globalData.morentouxiang)
},
onSuccess: () => {
this.subscribeGroupIfNeeded();
this.setupAllListeners();
this.loadHistory(true).then(() => this.markGroupMessageAsRead());
this.subscribeGroupIfNeeded()
.then(() => {
this.setupAllListeners();
return this.loadHistory(true);
})
.then(() => this.markGroupMessageAsRead());
},
onFailed: (error) => {
if (error.code === 408) {
this.subscribeGroupIfNeeded();
this.setupAllListeners();
this.loadHistory(true);
this.subscribeGroupIfNeeded().then(() => {
this.setupAllListeners();
this.loadHistory(true);
});
} else {
wx.showToast({ title: '连接失败，请重试', icon: 'none' });
}
@@ -150,11 +234,19 @@ Page({
subscribeGroupIfNeeded() {
const { groupId } = this.data;
if (!groupId) return;
wx.goEasy.im.subscribeGroup({
groupIds: [groupId],
onSuccess: () => console.log(`[群聊页] 订阅成功: ${groupId}`),
onFailed: (err) => console.error(`[群聊页] 订阅失败: ${groupId}`, err)
if (!groupId || !wx.goEasy?.im) return Promise.resolve();
return new Promise((resolve) => {
wx.goEasy.im.subscribeGroup({
groupIds: [groupId],
onSuccess: () => {
console.log(`[群聊页] 订阅成功: ${groupId}`);
resolve();
},
onFailed: (err) => {
console.error(`[群聊页] 订阅失败: ${groupId}`, err);
resolve();
},
});
});
},
@@ -219,6 +311,9 @@ Page({
if (idx === 0) m.showTime = true;
else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
if (!m.senderData) m.senderData = { name: '未知用户', avatar: '' };
if (m.type === 'order' && m.payload) {
this.applyOrderCardPayload(m.payload);
}
});
let final = refresh ? list : [...list, ...this.data.messages];
if (!refresh) {
@@ -249,10 +344,14 @@ Page({
if (this._msgHandler) wx.goEasy.im.off(wx.GoEasy.IM_EVENT.GROUP_MESSAGE_RECEIVED, this._msgHandler);
this._msgHandler = (msg) => {
if (msg.groupId !== this.data.groupId) return;
if (msg.senderId === this.data.currentUser.id) return;
normalizeGroupMessage(msg);
if (msg.type === 'order' && msg.payload) {
this.applyOrderCardPayload(msg.payload);
}
if (msg.senderId === this.data.currentUser.id && msg.type !== 'order') return;
msg.formattedTime = formatDate(msg.timestamp);
const msgs = this.data.messages;
if (msgs.some((m) => m.messageId === msg.messageId)) return;
const last = msgs.length ? msgs[msgs.length-1] : null;
msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
this.setData({ messages: [...msgs, msg], scrollToView: 'msg-bottom' });
@@ -339,8 +438,8 @@ Page({
}
that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
},
onSuccess: (messageId, status) => {
that.updateMsg(messageId, status);
onSuccess: (messageId, status, serverMsg) => {
that.mergeServerMessage(messageId, status, serverMsg);
}
});
},
@@ -367,8 +466,8 @@ Page({
}
that.setData({ messages: [...msgs, localMsg], scrollToView: 'msg-bottom' });
},
onSuccess: (messageId, status) => {
that.updateMsg(messageId, status);
onSuccess: (messageId, status, serverMsg) => {
that.mergeServerMessage(messageId, status, serverMsg);
}
});
},
@@ -403,7 +502,7 @@ Page({
const msgId = e.currentTarget.dataset.messageid;
if (!msgId) return;
const msg = this.data.messages.find(m => m.messageId === msgId);
if (!msg || msg.messageId.startsWith('local-')) return;
if (!msg || String(msg.messageId).startsWith('local-')) return;
const itemList = ['复制'];
if (msg.senderId === this.data.currentUser.id && (Date.now() - msg.timestamp < 120000) && !msg.recalled) {
itemList.push('撤回');

28
miniprogram/pages/xiaoxi/xiaoxi.js
View File

@@ -32,14 +32,34 @@ Page({
this.renderConversations(content);
}
};
this._onUnreadChanged = (data) => {
const unreadTotal = data?.unreadTotal ?? app.globalData.messageManager?.unreadTotal ?? 0;
if (app.globalData.messageManager) {
app.globalData.messageManager.unreadTotal = unreadTotal;
}
if (app.emitEvent) {
app.emitEvent('tabBarBadgeChanged', {
badgeText: unreadTotal > 0 ? String(unreadTotal) : '',
});
}
if (this.data.currentUser) {
this.loadConversations();
}
};
app.on('conversationsUpdated', this._onGlobalConvUpdated);
app.on('unreadCountChanged', this._onGlobalConvUpdated);
app.on('unreadCountChanged', this._onUnreadChanged);
},
onUnload() {
if (this._onGlobalConvUpdated) {
app.off('conversationsUpdated', this._onGlobalConvUpdated);
app.off('unreadCountChanged', this._onGlobalConvUpdated);
}
if (this._onUnreadChanged) {
app.off('unreadCountChanged', this._onUnreadChanged);
}
if (this.conversationsUpdatedListener && wx.goEasy?.im) {
wx.goEasy.im.off(wx.GoEasy.IM_EVENT.CONVERSATIONS_UPDATED, this.conversationsUpdatedListener);
this.conversationsUpdatedListener = null;
}
},
@@ -55,11 +75,7 @@ Page({
this.checkPermissionAndAutoConnect();
},
// ❌ 原版注释保留：删除所有清理逻辑，监听器永久存活
onHide() {},
onUnload() {},
// ========== 鉴权检查 ==========
async checkPermissionAndAutoConnect() {
const seq = ++this._permissionSeq;
let quanxian;