Merge branch 'wyfMain-dev'

This commit is contained in:
wangyifeng 2025-06-05 09:20:03 +08:00
commit 928c4f91f9

View File

@ -870,12 +870,12 @@ const loadMoreReadListDetail = () => {
<!-- 已读回执 --> <!-- 已读回执 -->
<div class="talk_read_num" v-if="item.user_id === props.uid"> <div class="talk_read_num" v-if="item.user_id === props.uid">
<n-popover trigger="click" placement="bottom-end" style="height: 382px; padding: 0;">
<template #trigger>
<span v-if="props.talk_type === 1">{{ <span v-if="props.talk_type === 1">{{
item.read_total_num > 0 ? '已读' : '未读' item.read_total_num > 0 ? '已读' : '未读'
}}</span> }}</span>
<span v-if="props.talk_type === 2" @click="toShowMessageReadDetail(item)"> <n-popover trigger="click" placement="bottom-end" style="height: 382px; padding: 0;" v-if="props.talk_type === 2">
<template #trigger>
<span v-if="props.talk_type === 2" @click="toShowMessageReadDetail(item)" style="cursor: pointer;">
已读 ({{ item?.read_total_num || 0 }}/{{ 已读 ({{ item?.read_total_num || 0 }}/{{
props.num - 1 > 0 ? props.num - 1 : 0 props.num - 1 > 0 ? props.num - 1 : 0
}}) }})
@ -1139,7 +1139,6 @@ const loadMoreReadListDetail = () => {
line-height: 17px; line-height: 17px;
margin: 5px 0 0; margin: 5px 0 0;
span { span {
cursor: pointer;
} }
} }