chore: 抢单端UI回退前备份当前完整工作区

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-29 17:59:23 +08:00
parent 6e2f7bc39f
commit e8fb32c1fe
53 changed files with 3410 additions and 1065 deletions
--- a/pages/cs-chat/cs-chat.js
+++ b/pages/cs-chat/cs-chat.js
@@ -1,7 +1,13 @@
 const app = getApp();
 import { formatDate } from '../../static/lib/utils';
 import { getLocalImUserId } from '../../utils/im-user.js';
-import { resolveAvatarUrl } from '../../utils/avatar.js';
+import { resolveAvatarUrl, getDefaultAvatarUrl, resolveAvatarFromStorage, subscribeConfigAvatarRefresh, ensureAvatarUrl } from '../../utils/avatar.js';
+import {
+  fetchHistoryMessages,
+  getOldestHistoryTimestamp,
+  mergeHistoryMessages,
+  waitImConnected,
+} from '../../utils/chat-history.js';

 Page({
  data: {
@@ -29,11 +35,13 @@ Page({
    pendingImage: '',
    pendingImageFile: null,
    keyboardHeight: 0,
-    bottomSafeHeight: 10
+    bottomSafeHeight: 140,
+    defaultAvatarUrl: '',
  },

  onLoad(options) {
    let teamId = '', teamName = '客服', teamAvatar = '';
+    const defAvatar = getDefaultAvatarUrl(app);
    if (options.data) {
      try {
        const p = JSON.parse(decodeURIComponent(options.data));
@@ -43,18 +51,51 @@ Page({
      } catch (e) {
      }
    }
-    if (!teamAvatar) {
-      teamAvatar = app.globalData.ossImageUrl + app.globalData.morentouxiang;
+    let teamAvatarResolved = teamAvatar ? ensureAvatarUrl(teamAvatar, app) : defAvatar;
+    if (!teamAvatarResolved || !teamAvatarResolved.startsWith('http')) {
+      teamAvatarResolved = defAvatar;
    }
-    this.setData({ teamId, teamName, teamAvatar });
+    this.setData({ teamId, teamName, teamAvatar: teamAvatarResolved, defaultAvatarUrl: defAvatar });
    wx.setNavigationBarTitle({ title: teamName });
    this.initCurrentUser();
+    this._unsubConfigAvatar = subscribeConfigAvatarRefresh(this, () => {
+      const def = getDefaultAvatarUrl(app);
+      this.setData({
+        defaultAvatarUrl: def,
+        teamAvatar: def,
+      });
+      this.refreshCurrentUserAvatar();
+    });
+  },
+
+  onUnload() {
+    if (this._unsubConfigAvatar) {
+      this._unsubConfigAvatar();
+      this._unsubConfigAvatar = null;
+    }
  },

  onShow() {
+    const defAvatar = getDefaultAvatarUrl(app);
+    const patch = {
+      defaultAvatarUrl: defAvatar,
+      teamAvatar: defAvatar,
+    };
+    this.setData(patch);
+    this.refreshCurrentUserAvatar();
    this.autoConnect();
  },

+  refreshCurrentUserAvatar() {
+    const defAvatar = getDefaultAvatarUrl(app);
+    const cu = this.data.currentUser;
+    if (!cu) return;
+    const avatar = resolveAvatarUrl(cu.avatar || wx.getStorageSync('touxiang'), app) || defAvatar;
+    if (avatar !== cu.avatar) {
+      this.setData({ currentUser: { ...cu, avatar } });
+    }
+  },
+
  onHide() {
    this.clearAllListeners();
  },
@@ -63,16 +104,25 @@ Page({
    const targetUserId = getLocalImUserId(app);
    if (!targetUserId) return;

+    const ready = () => {
+      this.setupAllListeners();
+      this.loadHistory(true);
+    };
+
+    if (app.ensureConnection) {
+      app.ensureConnection();
+      setTimeout(ready, 400);
+      return;
+    }
+
    const status = wx.goEasy.getConnectionStatus ? wx.goEasy.getConnectionStatus() : 'disconnected';
    if (status === 'connected' || status === 'reconnected') {
      const currentUserId = wx.goEasy.im ? wx.goEasy.im.userId : null;
      if (currentUserId === targetUserId) {
-        this.setupAllListeners();
-        this.loadHistory(true);
+        ready();
        return;
-      } else {
-        wx.goEasy.disconnect();
      }
+      wx.goEasy.disconnect();
    }
    this.connectGoEasy(targetUserId);
  },
@@ -84,7 +134,7 @@ Page({
      id: userId,
      data: {
        name: currentUser.name,
-        avatar: resolveAvatarUrl(currentUser.avatar, app)
+        avatar: resolveAvatarUrl(currentUser.avatar, app) || getDefaultAvatarUrl(app)
      },
      onSuccess: () => {
        this.setupAllListeners();
@@ -119,11 +169,13 @@ Page({
  initCurrentUser() {
    const imId = getLocalImUserId(app);
    const uid = wx.getStorageSync('uid');
+    const defAvatar = getDefaultAvatarUrl(app);
+    const avatar = resolveAvatarFromStorage(app) || defAvatar;
    this.setData({
      currentUser: {
        id: imId || ('Boss' + uid),
-        name: app.globalData.currentUser?.name || `用户${uid}`,
-        avatar: resolveAvatarUrl(wx.getStorageSync('touxiang'), app),
+        name: app.globalData.currentUser?.name || wx.getStorageSync('nicheng') || `用户${uid}`,
+        avatar,
      },
    });
  },
@@ -169,66 +221,89 @@ Page({
    this.setData({ messages: msgs });
  },

+  mapHistoryMessage(m, idx, list) {
+    m = this.normalizeMessage(m);
+    m.formattedTime = formatDate(m.timestamp);
+    if (idx === 0) m.showTime = true;
+    else m.showTime = (m.timestamp - list[idx - 1].timestamp) / 60000 > 5;
+    if (m.senderId === this.data.currentUser?.id) {
+      const av = resolveAvatarUrl(this.data.currentUser.avatar, app) || this.data.defaultAvatarUrl;
+      m.senderData = { name: this.data.currentUser.name, avatar: av };
+    } else {
+      const av = resolveAvatarUrl(this.data.teamAvatar, app) || this.data.defaultAvatarUrl;
+      m.senderData = { name: this.data.teamName, avatar: av };
+    }
+    return m;
+  },
+
+  injectWelcomeMessage(messages) {
+    const list = Array.isArray(messages) ? [...messages] : [];
+    const welcomeId = 'welcome-cs';
+    if (!list.some((m) => m.messageId === welcomeId)) {
+      const welcome = this.createWelcomeMessage();
+      welcome.messageId = welcomeId;
+      welcome.showTime = true;
+      list.unshift(welcome);
+    }
+    return list;
+  },
+
  // 历史消息
-  loadHistory(refresh) {
-    if (!refresh && !this.data.hasMore) return Promise.resolve();
-    return new Promise((resolve) => {
-      this.setData({ loadingHistory: true });
-      const { teamId, lastTimestamp } = this.data;
-      const ts = refresh ? null : lastTimestamp;
-      wx.goEasy.im.history({
-        type: wx.GoEasy.IM_SCENE.CS,
-        id: teamId,
+  async loadHistory(refresh) {
+    if (!refresh && !this.data.hasMore) return;
+    if (this.data.loadingHistory) return;
+    if (!this.data.teamId) return;
+
+    this.setData({ loadingHistory: true });
+    try {
+      const ready = await waitImConnected(app);
+      if (!ready) {
+        wx.showToast({ title: '消息服务未连接，请稍后重试', icon: 'none' });
+        return;
+      }
+
+      const ts = refresh
+        ? null
+        : getOldestHistoryTimestamp(this.data.messages, this.data.lastTimestamp);
+      if (!refresh && ts == null) {
+        this.setData({ hasMore: false });
+        wx.showToast({ title: '没有更早的消息了', icon: 'none' });
+        return;
+      }
+
+      const raw = await fetchHistoryMessages({
+        scene: wx.GoEasy.IM_SCENE.CS,
+        id: this.data.teamId,
        lastTimestamp: ts,
        limit: 20,
-        onSuccess: (res) => {
-          let list = res.content || [];
-          list.sort((a, b) => a.timestamp - b.timestamp);
-          list.forEach((m, idx) => {
-            m = this.normalizeMessage(m);
-            list[idx] = m;
-            m.formattedTime = formatDate(m.timestamp);
-            if (idx === 0) m.showTime = true;
-            else m.showTime = (m.timestamp - list[idx-1].timestamp) / 60000 > 5;
-            if (m.senderId === this.data.currentUser.id) {
-              m.senderData = { name: this.data.currentUser.name, avatar: this.data.currentUser.avatar };
-            } else {
-              m.senderData = { name: this.data.teamName, avatar: this.data.teamAvatar };
-            }
-          });
-          let final = refresh ? list : [...list, ...this.data.messages];
-          if (!refresh) {
-            for (let i=0; i<final.length; i++) {
-              if (i===0) final[i].showTime = true;
-              else final[i].showTime = (final[i].timestamp - final[i-1].timestamp) / 60000 > 5;
-            }
-          }
-          const ids = new Set();
-          const unique = [];
-          for (const m of final) { if (!ids.has(m.messageId)) { ids.add(m.messageId); unique.push(m); } }
-
-          // 插入欢迎语
-          const welcomeId = 'welcome-cs';
-          if (!unique.some(m => m.messageId === welcomeId)) {
-            const welcome = this.createWelcomeMessage();
-            welcome.messageId = welcomeId;
-            welcome.showTime = true;
-            unique.unshift(welcome);
-          }
-
-          const update = {
-            messages: unique,
-            hasMore: list.length >= 20,
-            lastTimestamp: unique.length ? unique[0].timestamp : lastTimestamp,
-            loadingHistory: false
-          };
-          if (refresh) update.scrollToView = 'msg-bottom';
-          this.setData(update);
-          resolve();
-        },
-        onFailed: () => { this.setData({ loadingHistory: false }); resolve(); }
      });
-    });
+
+      let merged = mergeHistoryMessages({
+        incoming: raw,
+        existing: this.data.messages,
+        refresh,
+        limit: 20,
+        mapMessage: (m, idx, list) => this.mapHistoryMessage(m, idx, list),
+      });
+
+      merged.messages = this.injectWelcomeMessage(merged.messages);
+      merged.lastTimestamp = getOldestHistoryTimestamp(merged.messages, merged.lastTimestamp);
+
+      const update = {
+        messages: merged.messages,
+        hasMore: merged.hasMore,
+        lastTimestamp: merged.lastTimestamp,
+      };
+      if (refresh) update.scrollToView = 'msg-bottom';
+      this.setData(update);
+    } catch (e) {
+      console.warn('[客服] 历史消息加载失败', e);
+      if (!refresh) {
+        wx.showToast({ title: '加载历史消息失败', icon: 'none' });
+      }
+    } finally {
+      this.setData({ loadingHistory: false });
+    }
  },

  createWelcomeMessage() {
@@ -238,7 +313,10 @@ Page({
      timestamp: Date.now(),
      senderId: 'system',
      receiverId: this.data.currentUser?.id,
-      senderData: { name: '系统消息', avatar: '' },
+      senderData: {
+        name: this.data.teamName || '客服',
+        avatar: resolveAvatarUrl(this.data.teamAvatar, app) || this.data.defaultAvatarUrl,
+      },
      payload: { text: '你好，请问有什么可以帮到您的？' },
      status: 'success',
      read: false,
@@ -255,7 +333,10 @@ Page({
      if (msg.senderId === this.data.currentUser.id) return;
      msg = this.normalizeMessage(msg);
      msg.formattedTime = formatDate(msg.timestamp);
-      msg.senderData = { name: this.data.teamName, avatar: this.data.teamAvatar };
+      msg.senderData = {
+        name: this.data.teamName,
+        avatar: resolveAvatarUrl(this.data.teamAvatar, app) || this.data.defaultAvatarUrl,
+      };
      const msgs = this.data.messages;
      const last = msgs.length ? msgs[msgs.length-1] : null;
      msg.showTime = last ? (msg.timestamp - last.timestamp) / 60000 > 5 : true;
@@ -521,9 +602,30 @@ Page({

  onKeyboardHeightChange(e) { this.setData({ keyboardHeight: e.detail.height }); },

+  onTeamAvatarError() {
+    this.setData({ teamAvatar: getDefaultAvatarUrl(app) });
+  },
+
+  onSelfAvatarError() {
+    const def = getDefaultAvatarUrl(app);
+    const cu = this.data.currentUser;
+    if (cu) {
+      this.setData({ currentUser: { ...cu, avatar: def } });
+    }
+  },
+
  onPullDownRefresh() {
    if (this.data.loadingHistory) return;
+    if (!this.data.hasMore) {
+      wx.showToast({ title: '没有更早的消息了', icon: 'none' });
+      this.setData({ isRefreshing: false });
+      wx.stopPullDownRefresh();
+      return;
+    }
    this.setData({ isRefreshing: true });
-    this.loadHistory(false).finally(() => { this.setData({ isRefreshing: false }); wx.stopPullDownRefresh(); });
+    this.loadHistory(false).finally(() => {
+      this.setData({ isRefreshing: false });
+      wx.stopPullDownRefresh();
+    });
  }
 });
--- a/pages/cs-chat/cs-chat.wxml
+++ b/pages/cs-chat/cs-chat.wxml
@@ -11,7 +11,7 @@
        <view class="chat-time-tag" wx:if="{{item.showTime}}">{{item.formattedTime}}</view>
        <view class="chat-msg-row {{item.senderId === currentUser.id ? 'chat-msg-row--right' : 'chat-msg-row--left'}}">
          <!-- 对方头像（客服） -->
-          <image wx:if="{{item.senderId !== currentUser.id}}" class="chat-avatar" src="{{teamAvatar}}" mode="aspectFill" />
+          <image wx:if="{{item.senderId !== currentUser.id}}" class="chat-avatar" src="{{defaultAvatarUrl}}" mode="aspectFill" binderror="onTeamAvatarError" />
          <view class="chat-bubble {{item.senderId === currentUser.id ? 'chat-bubble--right' : 'chat-bubble--left'}}"
                data-messageid="{{item.messageId}}"
                data-text="{{item.type==='text' ? item.payload.text : ''}}"
@@ -31,12 +31,12 @@
            <text wx:else class="chat-msg-text">{{item.payload.text || '[未知消息]'}}</text>
          </view>
          <!-- 自己头像 -->
-          <image wx:if="{{item.senderId === currentUser.id}}" class="chat-avatar" src="{{currentUser.avatar}}" mode="aspectFill" />
+          <image wx:if="{{item.senderId === currentUser.id}}" class="chat-avatar" src="{{currentUser.avatar || defaultAvatarUrl}}" mode="aspectFill" binderror="onSelfAvatarError" />
        </view>
        <!-- 🔥 已读/未读标签已彻底移除 -->
      </view>
    </block>
-    <view id="msg-bottom" style="height:20rpx;"></view>
+    <view id="msg-bottom" style="height:56rpx;"></view>
  </scroll-view>

  <!-- 底部输入区域（保持不变） -->