Merge remote-tracking branch 'origin/dev-订阅消息' into dev-2.3
This commit is contained in:
commit
e7ef2ac975
2
App.vue
2
App.vue
@ -8,7 +8,7 @@ export default {
|
||||
console.log("App Launch: ");
|
||||
|
||||
// 获取 openId 并初始化 IM
|
||||
await this.initIMOnLaunch();
|
||||
// await this.initIMOnLaunch();
|
||||
},
|
||||
onShow: function () {
|
||||
const db = dbStore();
|
||||
|
||||
@ -190,6 +190,7 @@ async function init() {
|
||||
await getCustomer();
|
||||
} else {
|
||||
const res = await getArchives();
|
||||
console.log('res:', res)
|
||||
if (res.length > 0) {
|
||||
visible.value = true;
|
||||
}
|
||||
@ -204,13 +205,9 @@ async function init() {
|
||||
|
||||
async function getArchives() {
|
||||
const res = await api('getUnbindMiniAppCustomers', { corpId: corpId.value, mobile: account.value?.mobile || '' });
|
||||
if (res && res.success) {
|
||||
corpName.value = res.corpName;
|
||||
customers.value = Array.isArray(res.data) ? res.data : [];
|
||||
} else {
|
||||
// toast(res?.message || '查询档案信息失败');
|
||||
}
|
||||
return []
|
||||
customers.value = res && Array.isArray(res.data) ? res.data : [];
|
||||
corpName.value = res && res.corpName ? res.corpName : '';
|
||||
return customers.value
|
||||
}
|
||||
|
||||
async function getBaseForm() {
|
||||
|
||||
@ -45,7 +45,7 @@ import pageLoading from "./loading.vue";
|
||||
|
||||
// const { useLoad, useShow } = useGuard();
|
||||
const { account } = storeToRefs(useAccount());
|
||||
const { login } = useAccount();
|
||||
const { login, getTeams } = useAccount();
|
||||
|
||||
const team = ref(null);
|
||||
const teams = ref([]);
|
||||
@ -77,10 +77,9 @@ async function changeTeam({ teamId, corpId, corpName }) {
|
||||
}
|
||||
}
|
||||
|
||||
async function getTeams(inviteTeamId = '') {
|
||||
async function getMatchTeams(inviteTeamId = '') {
|
||||
loading.value = true;
|
||||
const res = await api('getWxappRelateTeams', { openid: account.value.openid });
|
||||
teams.value = res && Array.isArray(res.data) ? res.data : [];
|
||||
teams.value = await getTeams();
|
||||
const matchTeamId = inviteTeamId || (team.value ? team.value.teamId : '');
|
||||
const validTeam = teams.value.find(i => i.teamId && i.teamId === matchTeamId);
|
||||
const firstTeam = teams.value[0]
|
||||
@ -110,7 +109,7 @@ onShow(async () => {
|
||||
corpUserIds.value[inviteTeam.teamId] = inviteTeam.corpUserId;
|
||||
}
|
||||
if (account.value && account.value.openid) {
|
||||
getTeams(inviteTeam && inviteTeam.teamId ? inviteTeam.teamId : '');
|
||||
getMatchTeams(inviteTeam && inviteTeam.teamId ? inviteTeam.teamId : '');
|
||||
} else {
|
||||
teams.value = [];
|
||||
}
|
||||
@ -124,11 +123,13 @@ onShow(async () => {
|
||||
|
||||
watch(account, (n, o) => {
|
||||
if (n && !o) {
|
||||
getTeams();
|
||||
getMatchTeams();
|
||||
} else if (!n && o) {
|
||||
teams.value = [];
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
</script>
|
||||
<style scoped>
|
||||
.home-container {
|
||||
|
||||
@ -37,6 +37,13 @@ $primary-color: #0877F1;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.header-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.patient-basic-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
@ -84,6 +91,26 @@ $primary-color: #0877F1;
|
||||
}
|
||||
}
|
||||
|
||||
.remind-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 8rpx 20rpx;
|
||||
border-radius: 24rpx;
|
||||
border: 2rpx solid #3876f6;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.remind-btn:active {
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
.remind-btn-text {
|
||||
font-size: 24rpx;
|
||||
color: #3876f6;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.badge-processing {
|
||||
background: #d1ecf1;
|
||||
|
||||
|
||||
@ -6,21 +6,30 @@
|
||||
<!-- 患者信息栏 -->
|
||||
<view class="patient-info-bar" v-if="patientInfo.name">
|
||||
<view class="patient-info-content">
|
||||
<view class="patient-basic-info">
|
||||
<text class="patient-name">{{ patientInfo.name }}</text>
|
||||
<text class="patient-detail"
|
||||
>{{ patientInfo.sex }} · {{ patientInfo.age }}岁</text
|
||||
>
|
||||
</view>
|
||||
<view
|
||||
class="status-badge"
|
||||
:class="chatStatusInfo.badgeClass"
|
||||
v-if="chatStatusInfo.badgeText"
|
||||
>
|
||||
<text class="badge-text">{{ chatStatusInfo.badgeText }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="patient-basic-info">
|
||||
<text class="patient-name">{{ patientInfo.name }}</text>
|
||||
<text class="patient-detail"
|
||||
>{{ patientInfo.sex }} · {{ patientInfo.age }}岁</text
|
||||
>
|
||||
</view>
|
||||
<view class="header-actions">
|
||||
<view
|
||||
class="status-badge"
|
||||
:class="chatStatusInfo.badgeClass"
|
||||
v-if="chatStatusInfo.badgeText"
|
||||
>
|
||||
<text class="badge-text">{{ chatStatusInfo.badgeText }}</text>
|
||||
</view>
|
||||
<view
|
||||
v-if="showSubscribeEntry"
|
||||
class="remind-btn"
|
||||
@click="handleSubscribeReminder"
|
||||
>
|
||||
<text class="remind-btn-text">接收提醒</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 聊天消息区域 -->
|
||||
<scroll-view
|
||||
@ -185,16 +194,25 @@ import {
|
||||
} from "@/utils/chat-utils.js";
|
||||
import api from "@/utils/api.js";
|
||||
import useGroupChat from "./hooks/use-group-chat";
|
||||
import MessageTypes from "./components/message-types.vue";
|
||||
import ChatInput from "./components/chat-input.vue";
|
||||
import SystemMessage from "./components/system-message.vue";
|
||||
import ConsultCancel from "./components/consult-cancel.vue";
|
||||
import ConsultApply from "./components/consult-apply.vue";
|
||||
import MessageTypes from "./components/message-types.vue";
|
||||
import ChatInput from "./components/chat-input.vue";
|
||||
import SystemMessage from "./components/system-message.vue";
|
||||
import ConsultCancel from "./components/consult-cancel.vue";
|
||||
import ConsultApply from "./components/consult-apply.vue";
|
||||
import {
|
||||
checkConversationSubscribeEntryVisible,
|
||||
requestConversationSubscribeMessage,
|
||||
} from "@/utils/subscribe-message";
|
||||
import {
|
||||
SUBSCRIBE_MESSAGE_ROLE,
|
||||
SUBSCRIBE_MESSAGE_SCENE,
|
||||
} from "@/utils/subscribe-message-config";
|
||||
|
||||
const timChatManager = globalTimChatManager;
|
||||
|
||||
// corpId 从群组信息中获取
|
||||
const corpId = ref("");
|
||||
// corpId 从群组信息中获取
|
||||
const corpId = ref("");
|
||||
const showSubscribeEntry = ref(false);
|
||||
|
||||
// 获取登录状态
|
||||
const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
|
||||
@ -856,10 +874,11 @@ const handleScrollToUpper = async () => {
|
||||
};
|
||||
|
||||
// 页面显示
|
||||
onShow(() => {
|
||||
if (!account.value || !openid.value) {
|
||||
uni.redirectTo({
|
||||
url: "/pages/login/login",
|
||||
onShow(() => {
|
||||
loadSubscribeEntryState();
|
||||
if (!account.value || !openid.value) {
|
||||
uni.redirectTo({
|
||||
url: "/pages/login/login",
|
||||
});
|
||||
return;
|
||||
}
|
||||
@ -905,8 +924,16 @@ onShow(() => {
|
||||
}
|
||||
|
||||
startIMMonitoring(30000);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
watch(
|
||||
() => corpId.value,
|
||||
() => {
|
||||
loadSubscribeEntryState();
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 页面隐藏
|
||||
onHide(() => {
|
||||
@ -976,7 +1003,7 @@ const handleCancelConsult = async () => {
|
||||
};
|
||||
|
||||
// 处理咨询申请
|
||||
const handleApplyConsult = async () => {
|
||||
const handleApplyConsult = async () => {
|
||||
try {
|
||||
uni.showModal({
|
||||
title: "提示",
|
||||
@ -1060,11 +1087,36 @@ const handleApplyConsult = async () => {
|
||||
title: error.message || "操作失败",
|
||||
icon: "none",
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 页面卸载
|
||||
onUnmounted(() => {
|
||||
}
|
||||
};
|
||||
|
||||
const handleSubscribeReminder = async () => {
|
||||
await requestConversationSubscribeMessage({
|
||||
role: SUBSCRIBE_MESSAGE_ROLE.PATIENT,
|
||||
scene: SUBSCRIBE_MESSAGE_SCENE.CHAT,
|
||||
conversationId: chatInfo.value.conversationID || "",
|
||||
groupId: groupId.value || "",
|
||||
corpId: corpId.value || "",
|
||||
patientId: patientId.value || "",
|
||||
userId: openid.value || account.value?.openid || "",
|
||||
openid: openid.value || account.value?.openid || "",
|
||||
unionid: account.value?.unionid || "",
|
||||
extraData: {
|
||||
orderStatus: orderStatus.value || "",
|
||||
page: "pages/message/index",
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const loadSubscribeEntryState = async () => {
|
||||
showSubscribeEntry.value = await checkConversationSubscribeEntryVisible(
|
||||
corpId.value || "",
|
||||
true
|
||||
);
|
||||
};
|
||||
|
||||
// 页面卸载
|
||||
onUnmounted(() => {
|
||||
clearMessageCache();
|
||||
|
||||
// 移除键盘监听
|
||||
|
||||
@ -1,35 +1,17 @@
|
||||
<template>
|
||||
<view class="message-page">
|
||||
|
||||
<!-- 消息列表 -->
|
||||
<scroll-view
|
||||
class="message-list"
|
||||
scroll-y="true"
|
||||
refresher-enabled
|
||||
:refresher-triggered="refreshing"
|
||||
@refresherrefresh="handleRefresh"
|
||||
@scrolltolower="handleLoadMore"
|
||||
>
|
||||
<scroll-view class="message-list" scroll-y="true" refresher-enabled :refresher-triggered="refreshing"
|
||||
@refresherrefresh="handleRefresh" @scrolltolower="handleLoadMore">
|
||||
<!-- 加载状态 -->
|
||||
<view
|
||||
v-if="loading && conversationList.length === 0"
|
||||
class="loading-container"
|
||||
>
|
||||
<view v-if="loading && conversationList.length === 0" class="loading-container">
|
||||
<text class="loading-text">加载中...</text>
|
||||
</view>
|
||||
<!-- 消息列表项 -->
|
||||
<view
|
||||
v-for="conversation in conversationList"
|
||||
:key="conversation.groupID || conversation.conversationID"
|
||||
class="message-item"
|
||||
@click="handleClickConversation(conversation)"
|
||||
>
|
||||
<view v-for="conversation in conversationList" :key="conversation.groupID || conversation.conversationID"
|
||||
class="message-item" @click="handleClickConversation(conversation)">
|
||||
<view class="avatar-container">
|
||||
<GroupAvatar
|
||||
:avatarList="getAvatarList(conversation.groupID)"
|
||||
:size="96"
|
||||
classType="square"
|
||||
/>
|
||||
<GroupAvatar :avatarList="getAvatarList(conversation.groupID)" :size="96" classType="square" />
|
||||
<view v-if="conversation.unreadCount > 0" class="unread-badge">
|
||||
<text class="unread-text">{{
|
||||
conversation.unreadCount > 99 ? "99+" : conversation.unreadCount
|
||||
@ -57,10 +39,7 @@
|
||||
</view>
|
||||
|
||||
<!-- 空状态 -->
|
||||
<view
|
||||
v-if="!loading && conversationList.length === 0"
|
||||
class="empty-container"
|
||||
>
|
||||
<view v-if="!loading && conversationList.length === 0" class="empty-container">
|
||||
<image class="empty-image" src="/static/empty.svg" mode="aspectFit" />
|
||||
<text class="empty-text">暂无消息</text>
|
||||
</view>
|
||||
@ -72,11 +51,19 @@
|
||||
}}</text>
|
||||
</view>
|
||||
</scroll-view>
|
||||
|
||||
<view
|
||||
v-if="showSubscribeEntry"
|
||||
class="subscribe-entry"
|
||||
@click="handleSubscribeReminder"
|
||||
>
|
||||
<text class="subscribe-entry-text">接收提醒</text>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, computed, onUnmounted } from "vue";
|
||||
import { ref, computed, onUnmounted, watch } from "vue";
|
||||
import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
||||
import { storeToRefs } from "pinia";
|
||||
import useAccountStore from "@/store/account.js";
|
||||
@ -85,9 +72,19 @@ import { mergeConversationWithGroupDetails } from "@/utils/conversation-merger.j
|
||||
import { globalUnreadListenerManager } from "@/utils/global-unread-listener.js";
|
||||
import useGroupAvatars from "./hooks/use-group-avatars.js";
|
||||
import GroupAvatar from "@/components/group-avatar.vue";
|
||||
import {
|
||||
checkConversationSubscribeEntryVisible,
|
||||
requestConversationSubscribeMessage,
|
||||
} from "@/utils/subscribe-message";
|
||||
import {
|
||||
SUBSCRIBE_MESSAGE_ROLE,
|
||||
SUBSCRIBE_MESSAGE_SCENE,
|
||||
} from "@/utils/subscribe-message-config";
|
||||
|
||||
// 获取登录状态
|
||||
const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
|
||||
const { account, openid, isIMInitialized, hasImCorpId, teams } = storeToRefs(
|
||||
useAccountStore()
|
||||
);
|
||||
const { initIMAfterLogin } = useAccountStore();
|
||||
|
||||
// 状态
|
||||
@ -96,6 +93,7 @@ const loading = ref(false);
|
||||
const loadingMore = ref(false);
|
||||
const hasMore = ref(false);
|
||||
const refreshing = ref(false);
|
||||
const showSubscribeEntry = ref(false);
|
||||
|
||||
// 群聊头像管理
|
||||
const { loadGroupAvatars, getAvatarList } = useGroupAvatars();
|
||||
@ -255,7 +253,7 @@ let updateTimer = null;
|
||||
// 会话列表更新处理函数
|
||||
const handleConversationListUpdate = async (eventData) => {
|
||||
console.log("【消息列表页】会话列表更新事件:", eventData);
|
||||
|
||||
|
||||
// 处理单个会话更新(标记已读的情况)
|
||||
if (eventData && !Array.isArray(eventData) && eventData.conversationID) {
|
||||
const conversationID = eventData.conversationID;
|
||||
@ -374,9 +372,9 @@ const handleMessageReceived = (message) => {
|
||||
// 设置会话列表监听,实时更新列表
|
||||
const setupConversationListener = () => {
|
||||
if (!globalTimChatManager) return;
|
||||
|
||||
|
||||
console.log("【消息列表页】设置会话监听器");
|
||||
|
||||
|
||||
// 将回调添加到全局未读监听器的回调链中
|
||||
// 这样不会覆盖全局未读监听器,而是与之共存
|
||||
if (globalUnreadListenerManager.isInitialized) {
|
||||
@ -436,7 +434,7 @@ const formatMessageTime = (timestamp) => {
|
||||
// 点击会话
|
||||
const handleClickConversation = async (conversation) => {
|
||||
console.log("点击会话:", conversation);
|
||||
|
||||
|
||||
// 立即清除本地未读数显示
|
||||
const conversationIndex = conversationList.value.findIndex(
|
||||
(conv) => conv.conversationID === conversation.conversationID
|
||||
@ -452,7 +450,7 @@ const handleClickConversation = async (conversation) => {
|
||||
conversationID: conversation.conversationID,
|
||||
});
|
||||
console.log("✓ 已标记会话为已读:", conversation.conversationID);
|
||||
|
||||
|
||||
// 立即刷新 tabBar 徽章
|
||||
// await globalUnreadListenerManager.refreshBadge();
|
||||
} catch (error) {
|
||||
@ -479,6 +477,7 @@ const handleLoadMore = () => {
|
||||
|
||||
// 下拉刷新
|
||||
const handleRefresh = async () => {
|
||||
if (!hasImCorpId.value) return;
|
||||
refreshing.value = true;
|
||||
|
||||
try {
|
||||
@ -489,7 +488,7 @@ const handleRefresh = async () => {
|
||||
};
|
||||
|
||||
// 页面加载
|
||||
onLoad( async() => {
|
||||
async function init() {
|
||||
try {
|
||||
// 初始化IM
|
||||
const imReady = await initIM();
|
||||
@ -503,7 +502,7 @@ onLoad( async() => {
|
||||
} catch (error) {
|
||||
console.log("页面初始化异常:", error.message);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 清理消息文本(移除换行符)
|
||||
const cleanMessageText = (text) => {
|
||||
@ -511,39 +510,75 @@ const cleanMessageText = (text) => {
|
||||
return text.replace(/[\r\n]+/g, " ").trim();
|
||||
};
|
||||
|
||||
const handleSubscribeReminder = async () => {
|
||||
await requestConversationSubscribeMessage({
|
||||
role: SUBSCRIBE_MESSAGE_ROLE.PATIENT,
|
||||
scene: SUBSCRIBE_MESSAGE_SCENE.LIST,
|
||||
corpId: teams.value.find((item) => item?.corpId)?.corpId || "",
|
||||
userId: openid.value || account.value?.openid || "",
|
||||
openid: openid.value || account.value?.openid || "",
|
||||
unionid: account.value?.unionid || "",
|
||||
extraData: {
|
||||
page: "pages/message/message",
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
const loadSubscribeEntryState = async () => {
|
||||
const currentCorpId = teams.value.find((item) => item?.corpId)?.corpId || "";
|
||||
showSubscribeEntry.value = await checkConversationSubscribeEntryVisible(
|
||||
currentCorpId,
|
||||
true
|
||||
);
|
||||
};
|
||||
|
||||
// 页面显示
|
||||
onShow(async () => {
|
||||
// 页面显示时刷新 tabBar 徽章
|
||||
// if (globalUnreadListenerManager.isInitialized) {
|
||||
// await globalUnreadListenerManager.refreshBadge();
|
||||
// }
|
||||
await loadSubscribeEntryState();
|
||||
});
|
||||
|
||||
watch(
|
||||
() => teams.value.map((item) => item?.corpId).join(","),
|
||||
() => {
|
||||
loadSubscribeEntryState();
|
||||
},
|
||||
{ immediate: true }
|
||||
);
|
||||
|
||||
// 页面隐藏
|
||||
onHide(() => {
|
||||
console.log("【消息列表页】页面隐藏");
|
||||
|
||||
|
||||
// 清除防抖定时器
|
||||
if (updateTimer) {
|
||||
clearTimeout(updateTimer);
|
||||
updateTimer = null;
|
||||
}
|
||||
|
||||
|
||||
// 注意:不要清除 globalTimChatManager 的回调
|
||||
// 因为全局未读监听器需要持续工作
|
||||
// 回调链会在页面销毁时自动清理
|
||||
});
|
||||
|
||||
watch(hasImCorpId, (n, o) => {
|
||||
if (n && !o) {
|
||||
init();
|
||||
}
|
||||
}, { immediate: true })
|
||||
// 页面卸载
|
||||
onUnmounted(() => {
|
||||
console.log("【消息列表页】页面卸载,清理回调");
|
||||
|
||||
|
||||
// 清除防抖定时器
|
||||
if (updateTimer) {
|
||||
clearTimeout(updateTimer);
|
||||
updateTimer = null;
|
||||
}
|
||||
|
||||
|
||||
// // 从全局未读监听器的回调链中移除本页面的回调
|
||||
// if (globalUnreadListenerManager.isInitialized) {
|
||||
// globalUnreadListenerManager.removeCallback("onConversationListUpdated", handleConversationListUpdate);
|
||||
@ -732,4 +767,32 @@ onUnmounted(() => {
|
||||
color: #999;
|
||||
padding-bottom: 10rpx;
|
||||
}
|
||||
|
||||
.subscribe-entry {
|
||||
position: fixed;
|
||||
right: 32rpx;
|
||||
bottom: 180rpx;
|
||||
width: 116rpx;
|
||||
height: 116rpx;
|
||||
border-radius: 58rpx;
|
||||
background: #fff;
|
||||
border: 2rpx solid #3876f6;
|
||||
box-shadow: 0 8rpx 24rpx rgba(56, 118, 246, 0.16);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
.subscribe-entry:active {
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
.subscribe-entry-text {
|
||||
width: 56rpx;
|
||||
font-size: 24rpx;
|
||||
line-height: 1.4;
|
||||
color: #3876f6;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { ref, watch } from "vue";
|
||||
import { ref, watch, computed } from "vue";
|
||||
import { defineStore } from "pinia";
|
||||
import api from '@/utils/api';
|
||||
import { toast } from '@/utils/widget';
|
||||
@ -13,6 +13,9 @@ export default defineStore("accountStore", () => {
|
||||
const isIMInitialized = ref(false);
|
||||
const openid = ref("");
|
||||
const externalUserId = ref('');
|
||||
const teams = ref([]);
|
||||
const hasImCorpId = computed(() => teams.value.some(i => i.corpId === 'wpLgjyawAA8N0gWmXgyJq8wpjGcOT7fg'));
|
||||
const teamsPromise = ref(null);
|
||||
|
||||
async function login(phoneCode = '') {
|
||||
if (loading.value) return;
|
||||
@ -38,7 +41,7 @@ export default defineStore("accountStore", () => {
|
||||
uni.setStorageSync('account', res.data);
|
||||
uni.setStorageSync('openid', res.data.openid);
|
||||
|
||||
initIMAfterLogin(openid.value)
|
||||
// initIMAfterLogin(openid.value)
|
||||
return res.data
|
||||
}
|
||||
}
|
||||
@ -77,10 +80,10 @@ export default defineStore("accountStore", () => {
|
||||
|
||||
isIMInitialized.value = true;
|
||||
console.log('IM 初始化成功');
|
||||
|
||||
|
||||
// IM 初始化成功后,设置全局未读消息监听
|
||||
// globalUnreadListenerManager.setup();
|
||||
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.log('IM初始化异常,跳过 IM 初始化:', error.message);
|
||||
@ -96,7 +99,7 @@ export default defineStore("accountStore", () => {
|
||||
await globalTimChatManager.destroy();
|
||||
console.log('腾讯IM退出成功');
|
||||
}
|
||||
|
||||
|
||||
// 清除全局未读监听
|
||||
if (globalUnreadListenerManager.isInitialized) {
|
||||
// globalUnreadListenerManager.destroy();
|
||||
@ -113,13 +116,28 @@ export default defineStore("accountStore", () => {
|
||||
// 清除本地存储
|
||||
uni.removeStorageSync('account');
|
||||
uni.removeStorageSync('openid');
|
||||
|
||||
|
||||
// 清除 tabBar 徽章
|
||||
uni.removeTabBarBadge({
|
||||
index: 1
|
||||
});
|
||||
}
|
||||
|
||||
async function searchTeams() {
|
||||
const res = await api('getWxappRelateTeams', { openid: account.value.openid });
|
||||
teams.value = res && Array.isArray(res.data) ? res.data : [];
|
||||
return teams.value;
|
||||
}
|
||||
|
||||
async function getTeams() {
|
||||
if (!teamsPromise.value) {
|
||||
teamsPromise.value = searchTeams();
|
||||
}
|
||||
await teamsPromise.value;
|
||||
teamsPromise.value = null;
|
||||
return teams.value;
|
||||
}
|
||||
|
||||
async function getExternalUserId(corpId) {
|
||||
const unionid = account.value?.unionid;
|
||||
const openid = account.value?.openid;
|
||||
@ -130,5 +148,17 @@ export default defineStore("accountStore", () => {
|
||||
}
|
||||
}
|
||||
|
||||
return { account, login, initIMAfterLogin, logout, openid, isIMInitialized, externalUserId, getExternalUserId }
|
||||
watch(hasImCorpId, n => {
|
||||
if (n) {
|
||||
initIMAfterLogin();
|
||||
}
|
||||
}, { immediate: true })
|
||||
|
||||
watch(openid, (n, o) => {
|
||||
if (n && !o) {
|
||||
getTeams();
|
||||
}
|
||||
}, { immediate: true })
|
||||
|
||||
return { account, teams, hasImCorpId, login, initIMAfterLogin, logout, openid, isIMInitialized, externalUserId, getExternalUserId, getTeams }
|
||||
})
|
||||
@ -72,7 +72,10 @@ const urlsConfig = {
|
||||
getGroupListByGroupId: "getGroupListByGroupId",
|
||||
createConsultGroup: "createConsultGroup",
|
||||
cancelConsultApplication: "cancelConsultApplication",
|
||||
getGroupList: "getGroupList"
|
||||
getGroupList: "getGroupList",
|
||||
getConversationSubscribeConfig: "getConversationSubscribeConfig",
|
||||
saveConversationSubscribeResult: "saveConversationSubscribeResult",
|
||||
sendConversationSubscribeEvent: "sendConversationSubscribeEvent"
|
||||
},
|
||||
survery: {
|
||||
getMiniAppReceivedSurveryList: 'getMiniAppReceivedSurveryList',
|
||||
|
||||
64
utils/subscribe-message-config.js
Normal file
64
utils/subscribe-message-config.js
Normal file
@ -0,0 +1,64 @@
|
||||
const env = __VITE_ENV__;
|
||||
|
||||
export const SUBSCRIBE_MESSAGE_ROLE = {
|
||||
PATIENT: "patient",
|
||||
DOCTOR: "doctor",
|
||||
};
|
||||
|
||||
export const SUBSCRIBE_MESSAGE_SCENE = {
|
||||
DEFAULT: "default",
|
||||
LIST: "list",
|
||||
CHAT: "chat",
|
||||
};
|
||||
|
||||
export const SUBSCRIBE_MESSAGE_EVENT = {
|
||||
PATIENT_CONSULT_APPLY: "patient_consult_apply",
|
||||
PATIENT_CHAT_MESSAGE: "patient_chat_message",
|
||||
DOCTOR_ACCEPT: "doctor_accept",
|
||||
DOCTOR_REJECT: "doctor_reject",
|
||||
DOCTOR_CHAT_MESSAGE: "doctor_chat_message",
|
||||
};
|
||||
|
||||
export const SUBSCRIBE_MESSAGE_TEMPLATES = {
|
||||
consultationReply: {
|
||||
code: "consultationReply",
|
||||
role: SUBSCRIBE_MESSAGE_ROLE.PATIENT,
|
||||
id:
|
||||
env.MP_SUBSCRIBE_TEMPLATE_CONSULT_REPLY ||
|
||||
"VF9AC-7Rr3E1drbxBCrxbC-rLTnidmlNXopKReSAd_w",
|
||||
name: "咨询回复通知",
|
||||
events: [
|
||||
SUBSCRIBE_MESSAGE_EVENT.DOCTOR_ACCEPT,
|
||||
SUBSCRIBE_MESSAGE_EVENT.DOCTOR_REJECT,
|
||||
SUBSCRIBE_MESSAGE_EVENT.DOCTOR_CHAT_MESSAGE,
|
||||
],
|
||||
fields: ["患者姓名", "回复时间", "回复者", "所属机构"],
|
||||
},
|
||||
};
|
||||
|
||||
export const SUBSCRIBE_MESSAGE_SCENE_TEMPLATE_MAP = {
|
||||
[SUBSCRIBE_MESSAGE_ROLE.PATIENT]: {
|
||||
[SUBSCRIBE_MESSAGE_SCENE.DEFAULT]: ["consultationReply"],
|
||||
[SUBSCRIBE_MESSAGE_SCENE.LIST]: ["consultationReply"],
|
||||
[SUBSCRIBE_MESSAGE_SCENE.CHAT]: ["consultationReply"],
|
||||
},
|
||||
};
|
||||
|
||||
export function resolveSubscribeTemplates({
|
||||
role,
|
||||
scene = SUBSCRIBE_MESSAGE_SCENE.DEFAULT,
|
||||
} = {}) {
|
||||
const roleMap = SUBSCRIBE_MESSAGE_SCENE_TEMPLATE_MAP[role] || {};
|
||||
const keys =
|
||||
roleMap[scene] || roleMap[SUBSCRIBE_MESSAGE_SCENE.DEFAULT] || [];
|
||||
const seen = new Set();
|
||||
|
||||
return keys
|
||||
.map((key) => SUBSCRIBE_MESSAGE_TEMPLATES[key])
|
||||
.filter((item) => item && item.id)
|
||||
.filter((item) => {
|
||||
if (seen.has(item.id)) return false;
|
||||
seen.add(item.id);
|
||||
return true;
|
||||
});
|
||||
}
|
||||
222
utils/subscribe-message.js
Normal file
222
utils/subscribe-message.js
Normal file
@ -0,0 +1,222 @@
|
||||
import api from "@/utils/api";
|
||||
import { toast } from "@/utils/widget";
|
||||
import { resolveSubscribeTemplates } from "./subscribe-message-config";
|
||||
|
||||
const SUBSCRIBE_ACCEPT_STATUS = "accept";
|
||||
const SUBSCRIBE_REJECT_STATUS = "reject";
|
||||
const SUBSCRIBE_BAN_STATUS = "ban";
|
||||
const SUBSCRIBE_FILTER_STATUS = "filter";
|
||||
const SUBSCRIBE_CANCEL_STATUS = "cancel";
|
||||
const SUBSCRIBE_FAILED_STATUS = "failed";
|
||||
const subscribeDisplayConfigCache = new Map();
|
||||
|
||||
function canUseSubscribeMessage() {
|
||||
return (
|
||||
typeof wx !== "undefined" &&
|
||||
typeof wx.requestSubscribeMessage === "function"
|
||||
);
|
||||
}
|
||||
|
||||
function requestSubscribeMessage(tmplIds = []) {
|
||||
return new Promise((resolve) => {
|
||||
wx.requestSubscribeMessage({
|
||||
tmplIds,
|
||||
success(res) {
|
||||
resolve({ ok: true, res });
|
||||
},
|
||||
fail(err) {
|
||||
resolve({ ok: false, err });
|
||||
},
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function normalizeFailStatus(err = {}) {
|
||||
const errCode = Number(err.errCode || 0);
|
||||
const errMsg = String(err.errMsg || "").toLowerCase();
|
||||
|
||||
if (errCode === 20004 || errMsg.includes("main switch")) {
|
||||
return SUBSCRIBE_BAN_STATUS;
|
||||
}
|
||||
if (errCode === 20005 || errMsg.includes("ban")) {
|
||||
return SUBSCRIBE_BAN_STATUS;
|
||||
}
|
||||
if (errMsg.includes("filter")) {
|
||||
return SUBSCRIBE_FILTER_STATUS;
|
||||
}
|
||||
if (errMsg.includes("cancel")) {
|
||||
return SUBSCRIBE_CANCEL_STATUS;
|
||||
}
|
||||
return SUBSCRIBE_FAILED_STATUS;
|
||||
}
|
||||
|
||||
function buildTemplateResultRecords(templates = [], requestResult = {}, context = {}) {
|
||||
const requestedAt = Date.now();
|
||||
|
||||
if (requestResult.ok) {
|
||||
const res = requestResult.res || {};
|
||||
return templates.map((template) => ({
|
||||
role: context.role || "",
|
||||
scene: context.scene || "",
|
||||
conversationId: context.conversationId || "",
|
||||
groupId: context.groupId || "",
|
||||
corpId: context.corpId || "",
|
||||
teamId: context.teamId || "",
|
||||
patientId: context.patientId || "",
|
||||
doctorId: context.doctorId || "",
|
||||
userId: context.userId || "",
|
||||
openid: context.openid || "",
|
||||
unionid: context.unionid || "",
|
||||
templateId: template.id,
|
||||
templateCode: template.code,
|
||||
templateName: template.name,
|
||||
eventTypes: template.events,
|
||||
status: String(res[template.id] || SUBSCRIBE_FAILED_STATUS),
|
||||
rawResult: res,
|
||||
requestedAt,
|
||||
extraData: context.extraData || {},
|
||||
}));
|
||||
}
|
||||
|
||||
const status = normalizeFailStatus(requestResult.err);
|
||||
return templates.map((template) => ({
|
||||
role: context.role || "",
|
||||
scene: context.scene || "",
|
||||
conversationId: context.conversationId || "",
|
||||
groupId: context.groupId || "",
|
||||
corpId: context.corpId || "",
|
||||
teamId: context.teamId || "",
|
||||
patientId: context.patientId || "",
|
||||
doctorId: context.doctorId || "",
|
||||
userId: context.userId || "",
|
||||
openid: context.openid || "",
|
||||
unionid: context.unionid || "",
|
||||
templateId: template.id,
|
||||
templateCode: template.code,
|
||||
templateName: template.name,
|
||||
eventTypes: template.events,
|
||||
status,
|
||||
rawResult: requestResult.err || {},
|
||||
requestedAt,
|
||||
extraData: context.extraData || {},
|
||||
}));
|
||||
}
|
||||
|
||||
function buildToastMessage(records = [], reportResult = { success: false }) {
|
||||
const accepted = records.some((item) => item.status === SUBSCRIBE_ACCEPT_STATUS);
|
||||
|
||||
if (accepted && reportResult?.success === false) {
|
||||
return reportResult?.message || "提醒开启失败,请稍后再试";
|
||||
}
|
||||
|
||||
if (records.some((item) => item.status === SUBSCRIBE_ACCEPT_STATUS)) {
|
||||
return "会话消息提醒开启";
|
||||
}
|
||||
if (records.some((item) => item.status === SUBSCRIBE_BAN_STATUS)) {
|
||||
return "请先在微信设置中开启订阅消息提醒";
|
||||
}
|
||||
if (records.some((item) => item.status === SUBSCRIBE_FILTER_STATUS)) {
|
||||
return "当前提醒模板暂不可用";
|
||||
}
|
||||
if (records.some((item) => item.status === SUBSCRIBE_REJECT_STATUS)) {
|
||||
return "你已拒绝本次提醒订阅";
|
||||
}
|
||||
if (records.some((item) => item.status === SUBSCRIBE_CANCEL_STATUS)) {
|
||||
return "你已取消本次提醒订阅";
|
||||
}
|
||||
return "提醒订阅请求失败,请稍后再试";
|
||||
}
|
||||
|
||||
async function reportSubscribeResult(records = []) {
|
||||
if (!records.length) return { success: false };
|
||||
try {
|
||||
return await api(
|
||||
"saveConversationSubscribeResult",
|
||||
{
|
||||
records,
|
||||
},
|
||||
false
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("保存订阅结果失败:", error);
|
||||
return { success: false, message: error?.message || "保存失败" };
|
||||
}
|
||||
}
|
||||
|
||||
export async function checkConversationSubscribeEntryVisible(
|
||||
corpId = "",
|
||||
forceRefresh = false
|
||||
) {
|
||||
const normalizedCorpId = String(corpId || "").trim();
|
||||
if (!normalizedCorpId) return false;
|
||||
|
||||
if (!forceRefresh && subscribeDisplayConfigCache.has(normalizedCorpId)) {
|
||||
return subscribeDisplayConfigCache.get(normalizedCorpId);
|
||||
}
|
||||
|
||||
try {
|
||||
const result = await api(
|
||||
"getConversationSubscribeConfig",
|
||||
{ corpId: normalizedCorpId },
|
||||
false
|
||||
);
|
||||
const enabled = !!result?.data?.enabled;
|
||||
subscribeDisplayConfigCache.set(normalizedCorpId, enabled);
|
||||
return enabled;
|
||||
} catch (error) {
|
||||
console.error("获取订阅提醒显示配置失败:", error);
|
||||
subscribeDisplayConfigCache.set(normalizedCorpId, false);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export async function requestConversationSubscribeMessage(context = {}) {
|
||||
const templates = resolveSubscribeTemplates({
|
||||
role: context.role,
|
||||
scene: context.scene,
|
||||
});
|
||||
const requestTemplates = templates.slice(0, 1);
|
||||
|
||||
if (!requestTemplates.length) {
|
||||
await toast("暂未配置提醒模板");
|
||||
return {
|
||||
success: false,
|
||||
code: "template_missing",
|
||||
records: [],
|
||||
};
|
||||
}
|
||||
|
||||
if (!canUseSubscribeMessage()) {
|
||||
await toast("当前微信版本不支持订阅消息");
|
||||
return {
|
||||
success: false,
|
||||
code: "unsupported",
|
||||
records: [],
|
||||
};
|
||||
}
|
||||
|
||||
const requestResult = await requestSubscribeMessage(
|
||||
requestTemplates.map((item) => item.id)
|
||||
);
|
||||
const records = buildTemplateResultRecords(
|
||||
requestTemplates,
|
||||
requestResult,
|
||||
context
|
||||
);
|
||||
|
||||
const reportResult = await reportSubscribeResult(records);
|
||||
await toast(buildToastMessage(records, reportResult));
|
||||
|
||||
const subscribeSuccess =
|
||||
records.some((item) => item.status === SUBSCRIBE_ACCEPT_STATUS) &&
|
||||
reportResult?.success !== false;
|
||||
|
||||
return {
|
||||
success: subscribeSuccess,
|
||||
reportResult,
|
||||
records,
|
||||
acceptedTemplateIds: records
|
||||
.filter((item) => item.status === SUBSCRIBE_ACCEPT_STATUS)
|
||||
.map((item) => item.templateId),
|
||||
};
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user