huxuejian/ykt-team-wxapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf

Browse Source
This commit is contained in:
Jafeng 2026-02-10 17:44:06 +08:00
commit 2fe645a886
14 changed files with 131 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,4 +1,4 @@
MP_API_BASE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876
MP_TIM_SDK_APP_ID=1600126296

2
.env.localhost
View File

@ -1,4 +1,4 @@
MP_API_BASE_URL=http://localhost:8080
MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876
MP_TIM_SDK_APP_ID=1600126296

2
components/group-avatar.vue
View File

@ -25,7 +25,7 @@ const props = defineProps({
}
})
const list = computed(() => props.avatarList.map(i => i || '/static/default-avatar.png'))
const list = computed(() => props.avatarList.map(i => i || '/static/default-avatar.svg'))
const size = computed(() => {
const val = Number.isInteger(props.size) && props.size > 0 ? props.size : 144;

81
pages.json
View File

@ -1,155 +1,181 @@
{
"pages": [{
"pages": [
{
"path": "pages/home/home",
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom"
"navigationStyle": "custom",
"disableScroll": true
}
},
{
"path": "pages/article/article-list",
"style": {
"navigationBarTitleText": "我的宣教"
"navigationBarTitleText": "我的宣教",
"disableScroll": true
}
},
{
"path": "pages/article/article-cate-list",
"style": {
"navigationBarTitleText": "健康宣教"
"navigationBarTitleText": "健康宣教",
"disableScroll": true
}
},
{
"path": "pages/survey/survey-list",
"style": {
"navigationBarTitleText": "我的问卷"
"navigationBarTitleText": "我的问卷",
"disableScroll": true
}
},
{
"path": "pages/message/message",
"style": {
"navigationBarTitleText": "消息"
"navigationBarTitleText": "消息",
"disableScroll": true
}
},
{
"path": "pages/message/index",
"style": {
"navigationBarTitleText": "聊天",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"disableScroll": true
}
},
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "健康柚",
"navigationStyle": "custom"
"navigationStyle": "custom",
"disableScroll": true
}
},
{
"path": "pages/login/redirect-page",
"style": {
"navigationBarTitleText": "健康柚"
"navigationBarTitleText": "健康柚",
"disableScroll": true
}
},
{
"path": "pages/login/agreement",
"style": {
"navigationBarTitleText": "健康柚"
"navigationBarTitleText": "健康柚",
"disableScroll": true
}
},
{
"path": "pages/archive/archive-manage",
"style": {
"navigationBarTitleText": "档案管理"
"navigationBarTitleText": "档案管理",
"disableScroll": true
}
},
{
"path": "pages/archive/edit-archive",
"style": {
"navigationBarTitleText": "新增档案"
"navigationBarTitleText": "新增档案",
"disableScroll": true
}
},
{
"path": "pages/archive/archive-result",
"style": {
"navigationBarTitleText": "团队服务"
"navigationBarTitleText": "团队服务",
"disableScroll": true
}
},
{
"path": "pages/health/list",
"style": {
"navigationBarTitleText": "健康信息"
"navigationBarTitleText": "健康信息",
"disableScroll": true
}
},
{
"path": "pages/health/record",
"style": {
"navigationBarTitleText": "健康信息"
"navigationBarTitleText": "健康信息",
"disableScroll": true
}
},
{
"path": "pages/library/diagnosis-list",
"style": {
"navigationBarTitleText": "选择诊断"
"navigationBarTitleText": "选择诊断",
"disableScroll": true
}
},
{
"path": "pages/team/team-detail",
"style": {
"navigationBarTitleText": "团队介绍"
"navigationBarTitleText": "团队介绍",
"disableScroll": true
}
},
{
"path": "pages/team/homepage",
"style": {
"navigationBarTitleText": "个人主页"
"navigationBarTitleText": "个人主页",
"disableScroll": true
}
},
{
"path": "pages/team/friend",
"style": {
"navigationBarTitleText": "添加好友"
"navigationBarTitleText": "添加好友",
"disableScroll": true
}
},
{
"path": "pages/web-view/web-view",
"style": {
"navigationBarTitleText": ""
"navigationBarTitleText": "",
"disableScroll": true
}
},
{
"path": "pages/mine/mine",
"style": {
"navigationBarTitleText": "我的"
"navigationBarTitleText": "我的",
"disableScroll": true
}
},
{
"path": "pages/mine/contact",
"style": {
"navigationBarTitleText": "联系客服"
"navigationBarTitleText": "联系客服",
"disableScroll": true
}
},
{
"path": "pages/common/privacy",
"style": {
"navigationBarTitleText": "隐私政策"
"navigationBarTitleText": "隐私政策",
"disableScroll": true
}
},
{
"path": "pages/common/agreement",
"style": {
"navigationBarTitleText": "用户协议"
"navigationBarTitleText": "用户协议",
"disableScroll": true
}
},
{
"path": "pages/article/article-detail",
"style": {
"navigationBarTitleText": "宣教文章"
"navigationBarTitleText": "宣教文章",
"disableScroll": true
}
},
{
"path": "pages/article/send-article",
"style": {
"navigationBarTitleText": "选择宣教文章"
"navigationBarTitleText": "选择宣教文章",
"disableScroll": true
}
}
],
@ -164,7 +190,8 @@
"selectedColor": "#007aff",
"backgroundColor": "#ffffff",
"borderStyle": "white",
"list": [{
"list": [
{
"pagePath": "pages/home/home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home_selected.png",

2
pages/home/team-mate.vue
View File

@ -13,7 +13,7 @@
<view v-for="i in teamates" :key="i.userid"
class="member-card flex flex-shrink-0 min-w-120 mr-15 p-15"
@click="toHomePage(i)">
<image class="flex-shrink-0 avatar mr-10" :src="i.avatar || '/static/default-avatar.png'" />
<image class="flex-shrink-0 avatar mr-10" :src="i.avatar || '/static/default-avatar.svg'" />
<view class="flex-grow flex flex-col justify-between">
<view>
<view class="member-name leading-normal h-24 text-base font-semibold text-dark whitespace-nowrap">

2
pages/message/components/chat-input.vue
View File

@ -8,7 +8,7 @@
<view class="input-area">
<textarea v-if="!showVoiceInput" class="text-input" v-model="inputText" placeholder="我来说两句..."
@confirm="sendTextMessage" @focus="handleInputFocus" @input="handleInput"
:auto-height="true" :show-confirm-bar="false" :adjust-position="true" :cursor-spacing="80" />
:auto-height="true" :show-confirm-bar="false" :adjust-position="true" :cursor-spacing="40" />
<input v-else class="voice-input-btn" :class="{ recording: isRecording }" @touchstart="startRecord"
@touchmove="onRecordTouchMove" @touchend="stopRecord" @touchcancel="cancelRecord" :placeholder="isRecording ? '松开发送' : '按住说话'" disabled>
</input>

2
pages/message/hooks/use-group-avatars.js
View File

@ -10,7 +10,7 @@ export default function useGroupAvatars() {
const groupAvatarMap = ref({}) // { groupID: [avatarUrl1, avatarUrl2, ...] }
const teamStore = useTeamStore()
const patientDefaultAvatar = '/static/default-patient-avatar.png'
const teamMemberDefaultAvatar = '/static/default-avatar.png'
const teamMemberDefaultAvatar = '/static/default-avatar.svg'
/**
* 获取单个群聊的头像列表

10
pages/message/hooks/use-group-chat.js
View File

@ -47,10 +47,7 @@ export default function useGroupChat(groupID) {
const getUserAvatar = (userId) => {
const member = chatMember.value[userId]
if (!member) {
// 如果找不到成员信息，根据是否为团队成员返回默认头像
// 患者（userId为当前账户openid）使用 default-patient-avatar.png
// 其他情况使用 default-avatar.png
return userId === openid.value ? '/static/default-patient-avatar.png' : '/static/default-avatar.png'
return userId === openid.value ? '/static/default-patient-avatar.png' : '/static/default-avatar.svg'
}
// 如果有头像且不为空字符串，返回头像
@ -58,11 +55,8 @@ export default function useGroupChat(groupID) {
return member.avatar
}
// 否则根据是否为团队成员返回默认头像
// 患者使用 default-patient-avatar.png，团队成员使用 default-avatar.png
return member.isTeamMember ? '/static/default-avatar.png' : '/static/default-patient-avatar.png'
return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png'
}
// 获取群聊信息和成员头像
async function getGroupInfo() {
const gid = typeof groupID === 'string' ? groupID : groupID.value

22
pages/message/index.vue
View File

@ -9,7 +9,11 @@
>{{ patientInfo.sex }} · {{ patientInfo.age }}岁</text
>
</view>
<view class="status-badge" :class="chatStatusInfo.badgeClass" v-if="chatStatusInfo.badgeText">
<view
class="status-badge"
:class="chatStatusInfo.badgeClass"
v-if="chatStatusInfo.badgeText"
>
<text class="badge-text">{{ chatStatusInfo.badgeText }}</text>
</view>
</view>
@ -572,7 +576,6 @@ const initTIMCallbacks = async () => {
uniqueMessages.push(message);
}
});
messageList.value = uniqueMessages;
console.log(
"消息列表已更新，原始",
@ -664,7 +667,7 @@ const loadMessageList = async () => {
// 获取群组订单状态
await fetchGroupOrderStatus();
timChatManager.enterConversation(chatInfo.value.conversationID || "test1");
timChatManager.enterConversation(chatInfo.value.conversationID);
// 标记会话为已读 - 确保清空未读数
if (
@ -828,14 +831,11 @@ onShow(() => {
checkLoginAndInitTIM();
} else if (timChatManager.tim && !timChatManager.isLoggedIn) {
timChatManager.ensureIMConnection();
} else if (timChatManager.tim && timChatManager.isLoggedIn && chatInfo.value.conversationID) {
messageList.value = [];
isCompleted.value = false;
lastFirstMessageId.value = "";
loadMessageList();
}
} else if (
timChatManager.tim &&
timChatManager.isLoggedIn &&
chatInfo.value.conversationID
)
startIMMonitoring(30000);
});

78
pages/message/message.vue
View File

@ -1,9 +1,5 @@
<template>
<view class="message-page">
<!-- 标题栏 -->
<!-- <view class="message-header">
<text class="header-title">咨询</text>
</view> -->
<!-- 消息列表 -->
<scroll-view
@ -332,16 +328,14 @@ const setupConversationListener = () => {
existing.lastMessageTime !== conversationData.lastMessageTime ||
existing.unreadCount !== conversationData.unreadCount
) {
// 只更新变化的字段，保持头像和未读数稳定
// 只更新变化的字段，保持头像稳定
conversationList.value[existingIndex] = {
...conversationData,
// 保持原有头像，避免闪动
avatar: existing.avatar || conversationData.avatar,
// 保留较大的未读数（避免被后端数据覆盖）
unreadCount: Math.max(
existing.unreadCount || 0,
conversationData.unreadCount || 0
),
// 【修复】直接使用 TIM SDK 返回的未读数，不使用 Math.max
// 这样才能正确处理标记已读的情况（unreadCount 从 N 变为 0）
unreadCount: conversationData.unreadCount || 0
};
needSort = true;
console.log(
@ -369,40 +363,12 @@ const setupConversationListener = () => {
globalTimChatManager.setCallback("onMessageReceived", (message) => {
console.log("消息列表页面收到新消息:", message);
// 找到对应的会话
const conversationID = message.conversationID;
const conversationIndex = conversationList.value.findIndex(
(conv) => conv.conversationID === conversationID
);
if (conversationIndex !== -1) {
const conversation = conversationList.value[conversationIndex];
// 检查当前页面栈，判断用户是否正在查看该会话的聊天详情页
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
// 获取当前页面的 groupID 参数（如果在聊天详情页）
const currentGroupID = currentPage?.options?.groupID;
const isViewingThisConversation =
currentPage?.route === "pages/message/index" &&
currentGroupID === conversation.groupID;
// 如果用户正在查看这个具体的会话，不增加未读数
if (isViewingThisConversation) {
console.log("用户正在查看该会话，不增加未读数");
return;
}
// 只在用户不在该会话的聊天页面时才增加未读数
conversation.unreadCount = (conversation.unreadCount || 0) + 1;
console.log(
"已更新会话未读数:",
conversation.name,
"unreadCount:",
conversation.unreadCount
);
}
// 【修复】不再手动更新未读数
// TIM SDK 会在收到新消息时自动更新会话的未读数，并触发 onConversationListUpdated 事件
// 手动 +1 可能导致未读数不准确（重复计数）
//
// 注意：onConversationListUpdated 事件会在消息接收后自动触发，
// 其中包含了正确的未读数，因此这里不需要手动处理
});
};
@ -487,18 +453,7 @@ const handleRefresh = async () => {
};
// 页面加载
onLoad(() => {
console.log("消息列表页面加载");
});
// 清理消息文本（移除换行符）
const cleanMessageText = (text) => {
if (!text) return "";
return text.replace(/[\r\n]+/g, " ").trim();
};
// 页面显示
onShow(async () => {
onLoad( async() => {
try {
// 初始化IM
const imReady = await initIM();
@ -514,6 +469,17 @@ onShow(async () => {
}
});
// 清理消息文本（移除换行符）
const cleanMessageText = (text) => {
if (!text) return "";
return text.replace(/[\r\n]+/g, " ").trim();
};
// 页面显示
onShow(async () => {
});
// 页面隐藏
onHide(() => {
// 清除防抖定时器

2
pages/team/friend.vue
View File

@ -2,7 +2,7 @@
<view v-if="member" class="flex flex-col h-full items-center justify-center">
<view class="business-card">
<view class="flex">
<image class="mr-10 avatar" :src="member.avatar || '/static/default-avatar.png'"></image>
<image class="mr-10 avatar" :src="member.avatar || '/static/default-avatar.svg'"></image>
<view class="w-0 flex-grow leading-normal">
<view class="flex items-center">
<view class="mr-5 text-lg font-semibold text-dark">{{ member.anotherName }}</view>

4
pages/team/team-detail.vue
View File

@ -25,7 +25,7 @@
</view>
<view v-for="i in teammate.leaders" :key="i._id" class="mt-12 flex p-10 border-primary rounded-sm"
@click="toHomePage(i.userid)">
<image class="flex-shrink-0 mr-10 avatar" :src="i.avatar || '/static/default-avatar.png'"></image>
<image class="flex-shrink-0 mr-10 avatar" :src="i.avatar || '/static/default-avatar.svg'"></image>
<view class="w-0 flex-grow leading-normal">
<view class="flex items-center justify-between">
<view class="flex-shrink-0 mr-5 view-lg text-dark font-semibold">{{ i.anotherName }}</view>
@ -50,7 +50,7 @@
</view>
<view v-for="i in teammate.members" :key="i._id" class="mt-12 flex p-10 border-primary rounded-sm"
@click="toHomePage(i.userid)">
<image class="flex-shrink-0 mr-10 avatar" :src="i.avatar || '/static/default-avatar.png'"></image>
<image class="flex-shrink-0 mr-10 avatar" :src="i.avatar || '/static/default-avatar.svg'"></image>
<view class="w-0 flex-grow leading-normal">
<view class="flex items-center justify-between">
<view class="flex-shrink-0 mr-5 view-lg text-dark font-semibold">{{ i.anotherName }}</view>

5
utils/conversation-merger.js
View File

@ -144,7 +144,10 @@ function mergeConversationData(conversation, groupDetailsMap) {
name: formatConversationName(groupDetail),
// 更新头像（优先使用已有头像，避免闪动）
avatar: conversation.avatar || groupDetail.patient?.avatar || '/static/default-avatar.png'
avatar: conversation.avatar || groupDetail.patient?.avatar || '/static/default-avatar.svg',
// 【修复】保留未读消息数（确保不被覆盖）
unreadCount: conversation.unreadCount || 0
}
}

19
utils/tim-chat.js
View File

@ -1439,15 +1439,15 @@ class TimChatManager {
// 更新当前会话ID
this.currentConversationID = conversationID
// 清空当前消息列表
this.messageList = []
// 不清空消息列表，只重置分页状态
// this.messageList = []
// 重置分页状态
this.nextReqMessageID = ""
this.isCompleted = false
this.isLoadingMore = false
console.log(" 会话ID已更新，消息列表已清空，分页状态已重置")
console.log(" 会话ID已更新，分页状态已重置")
// 进入群聊会话，默认加载20条消息
this.enterGroupConversation(conversationID, 20)
@ -1455,6 +1455,7 @@ class TimChatManager {
// 进入群聊会话
async enterGroupConversation(groupID, count = 20) {
console.log("【enterGroupConversation】进入群聊会话, groupID:", groupID, "count:", count)
let conversationID = groupID
@ -1470,8 +1471,8 @@ class TimChatManager {
console.log(" conversationID:", conversationID, "actualGroupID:", actualGroupID)
// 清空消息列表，准备加载新会话的消息
this.messageList = []
// 不清空消息列表，只在首次进入时清空
// this.messageList = []
// 确保设置当前会话ID，防止消息混淆
this.currentConversationID = conversationID
@ -2220,8 +2221,8 @@ class TimChatManager {
// 确保使用当前会话的conversationID
const conversationID = this.conversation.conversationID || this.currentConversationID
// 获取图片尺寸信息
const imageInfo = await this.getImageInfo(imageFile);
// 使用默认尺寸，不调用接口获取图片信息
const defaultImageInfo = { width: 400, height: 300 }
const localMessage = {
ID: `local_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
@ -2230,8 +2231,8 @@ class TimChatManager {
payload: {
imageInfoArray: [{
url: this.getImageUrl(imageFile),
width: imageInfo.width,
height: imageInfo.height
width: defaultImageInfo.width,
height: defaultImageInfo.height
}]
},
lastTime: Date.now(),