修复bug
This commit is contained in:
parent
9f5331cd3b
commit
58c9329eb6
@ -1231,6 +1231,25 @@ $primary-color: #0877F1;
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.custom-bubble,
|
||||
.benefit-bubble {
|
||||
padding: 0 !important;
|
||||
border-radius: 0 !important;
|
||||
background: transparent !important;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
.custom-bubble::before,
|
||||
.custom-bubble::after,
|
||||
.benefit-bubble::before,
|
||||
.benefit-bubble::after {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.benefit-bubble {
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.message-right .message-card {
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
|
||||
@ -59,6 +59,28 @@
|
||||
mode="aspectFill" />
|
||||
</view>
|
||||
|
||||
<!-- 权益消息 -->
|
||||
<view v-else-if="getCustomMessageType(message) === 'benefit'" class="benefit-card">
|
||||
<view class="benefit-title">{{ benefitData.title }}</view>
|
||||
<view class="benefit-content">
|
||||
<view v-for="(item, index) in benefitData.items" :key="`${item.projectId}-${index}`" class="benefit-item">
|
||||
<view class="benefit-project-row">
|
||||
<text v-if="index === 0" class="benefit-label">项目：</text>
|
||||
<text v-else class="benefit-label-placeholder"></text>
|
||||
<text class="benefit-project-name">{{ item.projectName }}</text>
|
||||
<text class="benefit-count">X{{ item.usageCount }}</text>
|
||||
</view>
|
||||
<view class="benefit-valid-row">
|
||||
<text class="benefit-valid-label">有效期：</text>
|
||||
<text class="benefit-valid-value">{{ item.validTimeText || '无限期' }}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="benefit-detail-button" @click.stop="handleBenefitClick">
|
||||
<text class="benefit-detail-text">查看详情</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 其他自定义消息 -->
|
||||
<!-- <view
|
||||
v-else
|
||||
@ -112,8 +134,32 @@ const payloadData = computed(() => {
|
||||
}
|
||||
})
|
||||
|
||||
const benefitData = computed(() => ({
|
||||
title: payloadData.value.title || "医生为您录入专属权益",
|
||||
patientId: payloadData.value.patientId || "",
|
||||
patientName: payloadData.value.patientName || "",
|
||||
corpId: payloadData.value.corpId || props.corpId || "",
|
||||
teamId: payloadData.value.teamId || "",
|
||||
items: Array.isArray(payloadData.value.items) ? payloadData.value.items : [],
|
||||
}))
|
||||
|
||||
// 计算图片样式
|
||||
const handleBenefitClick = () => {
|
||||
const customerId = benefitData.value.patientId;
|
||||
const corpId = benefitData.value.corpId;
|
||||
if (!customerId || !corpId) {
|
||||
toast("权益信息不完整");
|
||||
return;
|
||||
}
|
||||
const params = [
|
||||
`corpId=${encodeURIComponent(corpId)}`,
|
||||
`teamId=${encodeURIComponent(benefitData.value.teamId || "")}`,
|
||||
`customerId=${encodeURIComponent(customerId)}`,
|
||||
`name=${encodeURIComponent(benefitData.value.patientName || "")}`,
|
||||
].join("&");
|
||||
uni.navigateTo({
|
||||
url: `/pages/experience-coupon/my-rights?${params}`,
|
||||
});
|
||||
};
|
||||
const getImageStyle = (imageInfo) => {
|
||||
// 如果没有尺寸信息，使用默认样式
|
||||
imageInfo.width = imageInfo.width || imageInfo.Width;
|
||||
@ -299,4 +345,95 @@ async function markArticleRead(sendId, articleId) {
|
||||
|
||||
<style scoped lang="scss">
|
||||
@import "../chat.scss";
|
||||
|
||||
.benefit-card {
|
||||
width: 520rpx;
|
||||
max-width: 100%;
|
||||
box-sizing: border-box;
|
||||
border-radius: 10rpx;
|
||||
padding: 22rpx 18rpx 18rpx;
|
||||
background: linear-gradient(180deg, #0b75f2 0%, #0067df 100%);
|
||||
}
|
||||
|
||||
.benefit-title {
|
||||
color: #fff;
|
||||
font-size: 32rpx;
|
||||
font-weight: 600;
|
||||
line-height: 1.3;
|
||||
margin-bottom: 18rpx;
|
||||
}
|
||||
|
||||
.benefit-content {
|
||||
border: 4rpx solid rgba(255, 255, 255, 0.28);
|
||||
border-radius: 8rpx;
|
||||
padding: 24rpx 24rpx 28rpx;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.benefit-item + .benefit-item {
|
||||
margin-top: 18rpx;
|
||||
}
|
||||
|
||||
.benefit-project-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.benefit-label,
|
||||
.benefit-label-placeholder {
|
||||
flex-shrink: 0;
|
||||
width: 104rpx;
|
||||
color: #8b8f96;
|
||||
font-size: 28rpx;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.benefit-project-name {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
color: #111827;
|
||||
font-size: 30rpx;
|
||||
line-height: 1.4;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.benefit-count {
|
||||
flex-shrink: 0;
|
||||
margin-left: 16rpx;
|
||||
color: #111827;
|
||||
font-size: 30rpx;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.benefit-valid-row {
|
||||
display: flex;
|
||||
margin-left: 104rpx;
|
||||
margin-top: 8rpx;
|
||||
}
|
||||
|
||||
.benefit-valid-label,
|
||||
.benefit-valid-value {
|
||||
color: #8b8f96;
|
||||
font-size: 26rpx;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.benefit-detail-button {
|
||||
height: 82rpx;
|
||||
margin-top: 28rpx;
|
||||
border-radius: 8rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: linear-gradient(180deg, #0b75f2 0%, #0067df 100%);
|
||||
}
|
||||
|
||||
.benefit-detail-text {
|
||||
color: #fff;
|
||||
font-size: 30rpx;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
@ -20,10 +20,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 聊天消息区域 -->
|
||||
<scroll-view class="chat-content" :style="{
|
||||
bottom: (keyboardHeight > 0 ? keyboardHeight + 60 : 60) + 'px',
|
||||
}" scroll-y="true" enhanced="true" bounces="false" :scroll-into-view="scrollIntoView" @scroll="onScroll"
|
||||
@scrolltoupper="handleScrollToUpper" @click="closeMorePanel" ref="chatScrollView">
|
||||
<scroll-view class="chat-content" :style="{
|
||||
bottom: (keyboardHeight > 0 ? keyboardHeight + 60 : 60) + 'px',
|
||||
}" scroll-y="true" enhanced="true" bounces="false" :scroll-into-view="scrollIntoView" @scroll="onScroll"
|
||||
@scrolltoupper="handleScrollToUpper" @click="closeMorePanel" ref="chatScrollView">
|
||||
<!-- 加载更多提示 -->
|
||||
<view class="load-more-tip" v-if="messageList.length >= 15">
|
||||
<view class="loading" v-if="isLoadingMore">
|
||||
@ -390,6 +390,19 @@ function handleSystemMessageReceived(message) {
|
||||
}
|
||||
}
|
||||
|
||||
// 获取自定义消息类型
|
||||
function getCustomMessageType(message) {
|
||||
try {
|
||||
const data =
|
||||
typeof message.payload?.data === "string"
|
||||
? JSON.parse(message.payload.data)
|
||||
: message.payload?.data || {};
|
||||
return data?.type || "";
|
||||
} catch (error) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
// 获取消息气泡样式类
|
||||
function getBubbleClass(message) {
|
||||
// 图片消息不需要气泡背景
|
||||
@ -397,7 +410,10 @@ function getBubbleClass(message) {
|
||||
return "image-bubble";
|
||||
}
|
||||
if (message.type === "TIMCustomElem") {
|
||||
return message.flow === "out" ? "" : "";
|
||||
if (getCustomMessageType(message) === "benefit") {
|
||||
return "benefit-bubble";
|
||||
}
|
||||
return "custom-bubble";
|
||||
}
|
||||
return message.flow === "out" ? "user-bubble" : "doctor-bubble";
|
||||
}
|
||||
@ -572,44 +588,44 @@ const initTIMCallbacks = async () => {
|
||||
) {
|
||||
seenIds.add(message.ID);
|
||||
uniqueMessages.push(message);
|
||||
}
|
||||
});
|
||||
|
||||
const mergedMessages = [];
|
||||
const mergedSeenIds = new Set();
|
||||
const existingMessages = Array.isArray(messageList.value)
|
||||
? messageList.value
|
||||
: [];
|
||||
|
||||
existingMessages.forEach((message) => {
|
||||
if (!message?.ID) return;
|
||||
if (message.conversationID !== chatInfo.value.conversationID) return;
|
||||
if (mergedSeenIds.has(message.ID)) return;
|
||||
mergedSeenIds.add(message.ID);
|
||||
mergedMessages.push(message);
|
||||
});
|
||||
|
||||
uniqueMessages.forEach((message) => {
|
||||
if (!message?.ID) return;
|
||||
if (mergedSeenIds.has(message.ID)) return;
|
||||
mergedSeenIds.add(message.ID);
|
||||
mergedMessages.push(message);
|
||||
});
|
||||
|
||||
mergedMessages.sort((a, b) => {
|
||||
const ta = Number(a?.lastTime || a?.time || 0) || 0;
|
||||
const tb = Number(b?.lastTime || b?.time || 0) || 0;
|
||||
return ta - tb;
|
||||
});
|
||||
|
||||
messageList.value = mergedMessages;
|
||||
console.log(
|
||||
"消息列表已更新，原始",
|
||||
messages.length,
|
||||
"条，过滤后",
|
||||
messageList.value.length,
|
||||
"条消息"
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
const mergedMessages = [];
|
||||
const mergedSeenIds = new Set();
|
||||
const existingMessages = Array.isArray(messageList.value)
|
||||
? messageList.value
|
||||
: [];
|
||||
|
||||
existingMessages.forEach((message) => {
|
||||
if (!message?.ID) return;
|
||||
if (message.conversationID !== chatInfo.value.conversationID) return;
|
||||
if (mergedSeenIds.has(message.ID)) return;
|
||||
mergedSeenIds.add(message.ID);
|
||||
mergedMessages.push(message);
|
||||
});
|
||||
|
||||
uniqueMessages.forEach((message) => {
|
||||
if (!message?.ID) return;
|
||||
if (mergedSeenIds.has(message.ID)) return;
|
||||
mergedSeenIds.add(message.ID);
|
||||
mergedMessages.push(message);
|
||||
});
|
||||
|
||||
mergedMessages.sort((a, b) => {
|
||||
const ta = Number(a?.lastTime || a?.time || 0) || 0;
|
||||
const tb = Number(b?.lastTime || b?.time || 0) || 0;
|
||||
return ta - tb;
|
||||
});
|
||||
|
||||
messageList.value = mergedMessages;
|
||||
console.log(
|
||||
"消息列表已更新，原始",
|
||||
messages.length,
|
||||
"条，过滤后",
|
||||
messageList.value.length,
|
||||
"条消息"
|
||||
);
|
||||
|
||||
isCompleted.value = data.isCompleted || false;
|
||||
isLoadingMore.value = false;
|
||||
@ -777,11 +793,11 @@ const scrollToBottom = (immediate = false) => {
|
||||
};
|
||||
|
||||
// 关闭功能栏
|
||||
const closeMorePanel = () => {
|
||||
uni.$emit("closeMorePanel");
|
||||
chatInputRef.value?.blurInput?.();
|
||||
uni.hideKeyboard();
|
||||
};
|
||||
const closeMorePanel = () => {
|
||||
uni.$emit("closeMorePanel");
|
||||
chatInputRef.value?.blurInput?.();
|
||||
uni.hideKeyboard();
|
||||
};
|
||||
|
||||
// 滚动事件
|
||||
const onScroll = throttle((e) => {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user