提交
This commit is contained in:
parent
9cdee03753
commit
cc9b56c5b4
@ -1,18 +1,34 @@
|
||||
<template>
|
||||
<view class="message-page">
|
||||
<!-- 头部组件 -->
|
||||
<message-header v-model:activeTab="activeTab" @team-change="handleTeamChange" @add-patient="handleAddPatient" />
|
||||
<message-header
|
||||
v-model:activeTab="activeTab"
|
||||
@team-change="handleTeamChange"
|
||||
@add-patient="handleAddPatient"
|
||||
/>
|
||||
|
||||
<!-- 消息列表 -->
|
||||
<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-for="conversation in filteredConversationList"
|
||||
:key="conversation.groupID || conversation.conversationID" class="message-item"
|
||||
@click="handleClickConversation(conversation)">
|
||||
<view
|
||||
v-for="conversation in filteredConversationList"
|
||||
:key="conversation.groupID || conversation.conversationID"
|
||||
class="message-item"
|
||||
@click="handleClickConversation(conversation)"
|
||||
>
|
||||
<view class="avatar-container">
|
||||
<image class="avatar" :src="conversation.avatar || '/static/default-avatar.png'"
|
||||
mode="aspectFill" />
|
||||
<image
|
||||
class="avatar"
|
||||
:src="conversation.avatar || '/static/default-avatar.png'"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view v-if="conversation.unreadCount > 0" class="unread-badge">
|
||||
<text class="unread-text">{{
|
||||
conversation.unreadCount > 99 ? "99+" : conversation.unreadCount
|
||||
@ -24,7 +40,10 @@
|
||||
<view class="header">
|
||||
<view class="name-info">
|
||||
<text class="name">{{ formatPatientName(conversation) }}</text>
|
||||
<text v-if="conversation.patientSex || conversation.patientAge" class="patient-info">
|
||||
<text
|
||||
v-if="conversation.patientSex || conversation.patientAge"
|
||||
class="patient-info"
|
||||
>
|
||||
{{ formatPatientInfo(conversation) }}
|
||||
</text>
|
||||
</view>
|
||||
@ -41,7 +60,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 空状态 -->
|
||||
<view v-if="!loading && filteredConversationList.length === 0" class="empty-container">
|
||||
<view
|
||||
v-if="filteredConversationList.length === 0"
|
||||
class="empty-container"
|
||||
>
|
||||
<image class="empty-image" src="/static/empty.svg" mode="aspectFit" />
|
||||
<text class="empty-text">{{
|
||||
activeTab === "processing" ? "暂无处理中的会话" : "暂无已结束的会话"
|
||||
@ -49,7 +71,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 加载更多 -->
|
||||
<view v-if="hasMore && filteredConversationList.length > 0" class="load-more">
|
||||
<view
|
||||
v-if="hasMore && filteredConversationList.length > 0"
|
||||
class="load-more"
|
||||
>
|
||||
<text class="load-more-text">{{
|
||||
loadingMore ? "加载中..." : "上拉加载更多"
|
||||
}}</text>
|
||||
@ -59,49 +84,26 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref,
|
||||
computed
|
||||
} from "vue";
|
||||
import {
|
||||
onLoad,
|
||||
onShow,
|
||||
onHide
|
||||
} from "@dcloudio/uni-app";
|
||||
import {
|
||||
storeToRefs
|
||||
} from "pinia";
|
||||
import { ref, computed } from "vue";
|
||||
import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
||||
import { storeToRefs } from "pinia";
|
||||
import useAccountStore from "@/store/account.js";
|
||||
import useTeamStore from "@/store/team.js";
|
||||
import useInfoCheck from "@/hooks/useInfoCheck.js";
|
||||
import {
|
||||
globalTimChatManager
|
||||
} from "@/utils/tim-chat.js";
|
||||
import {
|
||||
mergeConversationWithGroupDetails
|
||||
} from "@/utils/conversation-merger.js";
|
||||
import { globalTimChatManager } from "@/utils/tim-chat.js";
|
||||
import { mergeConversationWithGroupDetails } from "@/utils/conversation-merger.js";
|
||||
import MessageHeader from "./components/message-header.vue";
|
||||
|
||||
// 获取登录状态
|
||||
const {
|
||||
account,
|
||||
openid,
|
||||
isIMInitialized
|
||||
} = storeToRefs(useAccountStore());
|
||||
const {
|
||||
initIMAfterLogin
|
||||
} = useAccountStore();
|
||||
const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
|
||||
const { initIMAfterLogin } = useAccountStore();
|
||||
|
||||
// 获取团队信息
|
||||
const teamStore = useTeamStore();
|
||||
const {
|
||||
getTeams
|
||||
} = teamStore;
|
||||
const { getTeams } = teamStore;
|
||||
|
||||
// 信息完善检查
|
||||
const {
|
||||
withInfo
|
||||
} = useInfoCheck();
|
||||
const { withInfo } = useInfoCheck();
|
||||
|
||||
// 团队相关状态
|
||||
const currentTeamId = ref(""); // 空字符串表示"全部会话消息"
|
||||
@ -162,14 +164,13 @@
|
||||
});
|
||||
const success = await initIMAfterLogin();
|
||||
uni.hideLoading();
|
||||
|
||||
if (!success) {
|
||||
uni.showToast({
|
||||
title: "IM连接失败,请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return false;
|
||||
}
|
||||
// if (!success) {
|
||||
// uni.showToast({
|
||||
// title: "IM连接失败,请重试",
|
||||
// icon: "none",
|
||||
// });
|
||||
// return false;
|
||||
// }
|
||||
} else if (globalTimChatManager && !globalTimChatManager.isLoggedIn) {
|
||||
uni.showLoading({
|
||||
title: "重连中...",
|
||||
@ -191,7 +192,8 @@
|
||||
try {
|
||||
console.log("开始加载群聊列表");
|
||||
if (!globalTimChatManager || !globalTimChatManager.getGroupList) {
|
||||
throw new Error("IM管理器未初始化");
|
||||
loading.value = false;
|
||||
return;
|
||||
}
|
||||
const result = await globalTimChatManager.getGroupList();
|
||||
if (result && result.success && result.groupList) {
|
||||
@ -307,8 +309,7 @@
|
||||
const existing = conversationList.value[existingIndex];
|
||||
if (
|
||||
existing.lastMessage !== conversationData.lastMessage ||
|
||||
existing.lastMessageTime !== conversationData
|
||||
.lastMessageTime ||
|
||||
existing.lastMessageTime !== conversationData.lastMessageTime ||
|
||||
existing.unreadCount !== conversationData.unreadCount ||
|
||||
existing.patientName !== conversationData.patientName ||
|
||||
existing.patientSex !== conversationData.patientSex ||
|
||||
|
||||
@ -5,7 +5,13 @@
|
||||
<view class="mt-12 text-base text-dark">生命全周期健康管理伙伴</view>
|
||||
</view>
|
||||
<view class="login-btn-wrap">
|
||||
<button v-if="checked" class="login-btn" type="primary" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
|
||||
<button
|
||||
v-if="checked"
|
||||
class="login-btn"
|
||||
type="primary"
|
||||
open-type="getPhoneNumber"
|
||||
@getphonenumber="getPhoneNumber"
|
||||
>
|
||||
手机号快捷登录
|
||||
</button>
|
||||
<!-- <button v-if="checked" class="login-btn" type="primary" @click="getPhoneNumber()">
|
||||
@ -15,7 +21,10 @@
|
||||
手机号快捷登录
|
||||
</button>
|
||||
</view>
|
||||
<view class="flex items-center justify-center mt-12 px-15" @click="checked = !checked">
|
||||
<view
|
||||
class="flex items-center justify-center mt-12 px-15"
|
||||
@click="checked = !checked"
|
||||
>
|
||||
<checkbox :checked="checked" style="transform: scale(0.7)" />
|
||||
<view class="text-sm text-gray">我已阅读并同意</view>
|
||||
<view class="text-sm text-primary">《用户协议》、</view>
|
||||
@ -76,8 +85,8 @@ async function getPhoneNumber(e) {
|
||||
await attempToPage(redirectUrl.value);
|
||||
} else if (res && !(doctorInfo.value && doctorInfo.value.anotherName)) {
|
||||
uni.redirectTo({
|
||||
url: '/pages/work/profile'
|
||||
})
|
||||
url: "/pages/work/profile",
|
||||
});
|
||||
} else if (res) {
|
||||
toHome();
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
// SCSS 变量定义
|
||||
$font-size-text: 28rpx;
|
||||
$font-size-tip: 24rpx;
|
||||
$font-size-text: 30rpx;
|
||||
$font-size-tip: 28rpx;
|
||||
$font-size-title: 32rpx;
|
||||
$text-color-sub: #999;
|
||||
$primary-color: #0877F1;
|
||||
@ -331,7 +331,7 @@ $primary-color: #0877F1;
|
||||
}
|
||||
|
||||
.message-text {
|
||||
font-size: $font-size-text;
|
||||
font-size: 30rpx;
|
||||
line-height: 1.4;
|
||||
word-wrap: break-word;
|
||||
word-break: break-all;
|
||||
|
||||
@ -393,13 +393,13 @@ const checkLoginAndInitTIM = async () => {
|
||||
});
|
||||
const success = await initIMAfterLogin();
|
||||
uni.hideLoading();
|
||||
if (!success) {
|
||||
uni.showToast({
|
||||
title: "IM连接失败,请重试",
|
||||
icon: "none",
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if (!success) {
|
||||
// uni.showToast({
|
||||
// title: "IM连接失败,请重试",
|
||||
// icon: "none",
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
} else if (!timChatManager.isLoggedIn) {
|
||||
uni.showLoading({
|
||||
title: "重连中...",
|
||||
|
||||
@ -1,18 +1,33 @@
|
||||
<template>
|
||||
<view class="message-page">
|
||||
<!-- 头部组件 -->
|
||||
<message-header v-model:activeTab="activeTab" @team-change="handleTeamChange" @add-patient="handleAddPatient" />
|
||||
|
||||
<message-header
|
||||
v-model:activeTab="activeTab"
|
||||
@team-change="handleTeamChange"
|
||||
@add-patient="handleAddPatient"
|
||||
/>
|
||||
<!-- 消息列表 -->
|
||||
<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-for="conversation in filteredConversationList"
|
||||
:key="conversation.groupID || conversation.conversationID" class="message-item"
|
||||
@click="handleClickConversation(conversation)">
|
||||
<view
|
||||
v-for="conversation in filteredConversationList"
|
||||
:key="conversation.groupID || conversation.conversationID"
|
||||
class="message-item"
|
||||
@click="handleClickConversation(conversation)"
|
||||
>
|
||||
<view class="avatar-container">
|
||||
<image class="avatar" :src="conversation.avatar || '/static/default-patient-avatar.png'"
|
||||
mode="aspectFill" />
|
||||
<image
|
||||
class="avatar"
|
||||
:src="conversation.avatar || '/static/default-patient-avatar.png'"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view v-if="conversation.unreadCount > 0" class="unread-badge">
|
||||
<text class="unread-text">{{
|
||||
conversation.unreadCount > 99 ? "99+" : conversation.unreadCount
|
||||
@ -24,7 +39,10 @@
|
||||
<view class="header">
|
||||
<view class="name-info">
|
||||
<text class="name">{{ formatPatientName(conversation) }}</text>
|
||||
<text v-if="conversation.patientSex || conversation.patientAge" class="patient-info">
|
||||
<text
|
||||
v-if="conversation.patientSex || conversation.patientAge"
|
||||
class="patient-info"
|
||||
>
|
||||
{{ formatPatientInfo(conversation) }}
|
||||
</text>
|
||||
</view>
|
||||
@ -41,7 +59,20 @@
|
||||
</view>
|
||||
|
||||
<!-- 空状态 -->
|
||||
<view v-if="!loading && filteredConversationList.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>
|
||||
<view
|
||||
v-else-if="
|
||||
!loading &&
|
||||
filteredConversationList.length === 0
|
||||
"
|
||||
class="empty-container"
|
||||
>
|
||||
<image class="empty-image" src="/static/empty.svg" mode="aspectFit" />
|
||||
<text class="empty-text">{{
|
||||
activeTab === "processing" ? "暂无处理中的会话" : "暂无已结束的会话"
|
||||
@ -49,7 +80,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 加载更多 -->
|
||||
<view v-if="hasMore && filteredConversationList.length > 0" class="load-more">
|
||||
<view
|
||||
v-if="hasMore && filteredConversationList.length > 0"
|
||||
class="load-more"
|
||||
>
|
||||
<text class="load-more-text">{{
|
||||
loadingMore ? "加载中..." : "上拉加载更多"
|
||||
}}</text>
|
||||
@ -59,49 +93,26 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref,
|
||||
computed
|
||||
} from "vue";
|
||||
import {
|
||||
onLoad,
|
||||
onShow,
|
||||
onHide
|
||||
} from "@dcloudio/uni-app";
|
||||
import {
|
||||
storeToRefs
|
||||
} from "pinia";
|
||||
import { ref, computed } from "vue";
|
||||
import { onLoad, onShow, onHide } from "@dcloudio/uni-app";
|
||||
import { storeToRefs } from "pinia";
|
||||
import useAccountStore from "@/store/account.js";
|
||||
import useTeamStore from "@/store/team.js";
|
||||
import useInfoCheck from "@/hooks/useInfoCheck.js";
|
||||
import {
|
||||
globalTimChatManager
|
||||
} from "@/utils/tim-chat.js";
|
||||
import {
|
||||
mergeConversationWithGroupDetails
|
||||
} from "@/utils/conversation-merger.js";
|
||||
import { globalTimChatManager } from "@/utils/tim-chat.js";
|
||||
import { mergeConversationWithGroupDetails } from "@/utils/conversation-merger.js";
|
||||
import MessageHeader from "../home/components/message-header.vue";
|
||||
|
||||
// 获取登录状态
|
||||
const {
|
||||
account,
|
||||
openid,
|
||||
isIMInitialized
|
||||
} = storeToRefs(useAccountStore());
|
||||
const {
|
||||
initIMAfterLogin
|
||||
} = useAccountStore();
|
||||
const { account, openid, isIMInitialized } = storeToRefs(useAccountStore());
|
||||
const { initIMAfterLogin } = useAccountStore();
|
||||
|
||||
// 获取团队信息
|
||||
const teamStore = useTeamStore();
|
||||
const {
|
||||
getTeams
|
||||
} = teamStore;
|
||||
const { getTeams } = teamStore;
|
||||
|
||||
// 信息完善检查
|
||||
const {
|
||||
withInfo
|
||||
} = useInfoCheck();
|
||||
const { withInfo } = useInfoCheck();
|
||||
|
||||
// 团队相关状态
|
||||
const currentTeamId = ref(""); // 空字符串表示"全部会话消息"
|
||||
@ -167,7 +178,8 @@
|
||||
// 显示重试提示
|
||||
uni.showModal({
|
||||
title: "IM连接失败",
|
||||
content: "连接失败,请检查网络后重试。如果IM连接失败,请重新登陆IM再连接",
|
||||
content:
|
||||
"连接失败,请检查网络后重试。如果IM连接失败,请重新登陆IM再连接",
|
||||
confirmText: "重新登陆",
|
||||
cancelText: "取消",
|
||||
success: (res) => {
|
||||
@ -175,7 +187,7 @@
|
||||
// 重新登陆
|
||||
handleReloginIM();
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
return false;
|
||||
}
|
||||
@ -190,7 +202,8 @@
|
||||
// 显示重试提示
|
||||
uni.showModal({
|
||||
title: "IM连接失败",
|
||||
content: "连接失败,请检查网络后重试。如果IM连接失败,请重新登陆IM再连接",
|
||||
content:
|
||||
"连接失败,请检查网络后重试。如果IM连接失败,请重新登陆IM再连接",
|
||||
confirmText: "重新登陆",
|
||||
cancelText: "取消",
|
||||
success: (res) => {
|
||||
@ -198,7 +211,7 @@
|
||||
// 重新登陆
|
||||
handleReloginIM();
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
return false;
|
||||
}
|
||||
@ -395,8 +408,7 @@
|
||||
const existing = conversationList.value[existingIndex];
|
||||
if (
|
||||
existing.lastMessage !== conversationData.lastMessage ||
|
||||
existing.lastMessageTime !== conversationData
|
||||
.lastMessageTime ||
|
||||
existing.lastMessageTime !== conversationData.lastMessageTime ||
|
||||
existing.unreadCount !== conversationData.unreadCount ||
|
||||
existing.patientName !== conversationData.patientName ||
|
||||
existing.patientSex !== conversationData.patientSex ||
|
||||
|
||||
@ -41,6 +41,7 @@ export default defineStore("accountStore", () => {
|
||||
|
||||
async function loginByCode(phoneCode = '') {
|
||||
try {
|
||||
|
||||
const { code } = await uni.login({
|
||||
appid,
|
||||
provider: "weixin",
|
||||
@ -61,13 +62,12 @@ export default defineStore("accountStore", () => {
|
||||
}
|
||||
account.value = res.data;
|
||||
openid.value = res.data.openid;
|
||||
|
||||
// 持久化账户信息
|
||||
cache.set(CACHE_KEYS.ACCOUNT, res.data);
|
||||
cache.set(CACHE_KEYS.OPENID, res.data.openid);
|
||||
|
||||
// 登录成功后初始化腾讯IM
|
||||
await getDoctorInfo(openid.value);
|
||||
await getDoctorInfo({ openid: openid.value });
|
||||
await initIMAfterLogin();
|
||||
return res.data
|
||||
}
|
||||
|
||||
@ -283,7 +283,6 @@ function generateSendLink(survey, answerId, customerId, customerName, sendSurvey
|
||||
const { corpId, userId } = context;
|
||||
const isSystem = survey.createBy === 'system';
|
||||
let url = '';
|
||||
debugger
|
||||
if (isSystem) {
|
||||
// 系统问卷:使用 VITE_SURVEY_URL
|
||||
url = `${env?.MP_SURVEY_URL}?corpId=${corpId}&surveryId=${survey.surveryId}&memberId=${customerId}&sendSurveyId=${sendSurveyId}&userId=${userId}`;
|
||||
|
||||
@ -1030,6 +1030,11 @@ class TimChatManager {
|
||||
// 获取群聊列表
|
||||
getGroupList() {
|
||||
return new Promise((resolve, reject) => {
|
||||
// 检查userId是否存在,不存在则不需要初始化
|
||||
if (!this.currentUserID) {
|
||||
return
|
||||
}
|
||||
|
||||
// 如果 TIM 实例不存在,等待初始化
|
||||
if (!this.tim) {
|
||||
console.log('TIM实例不存在,等待初始化...')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user