From 990f2df9723c5ece2399d759d19786be17718ad4 Mon Sep 17 00:00:00 2001 From: cbb <1055026847@qq.com> Date: Wed, 28 Jan 2026 17:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E4=BA=AB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20=20=20console.log(item,=20'=3D=3D2222222=3D')?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message-elements/message-bubble.vue | 4 +- .../message-elements/message-quote/index.vue | 366 ++++---- .../message-list/message-tool/index.vue | 859 ++++++++++-------- .../contact-list/contact-list-item/index.vue | 389 ++++---- .../TUIContact/contact-list/index.vue | 1 - .../conversation-list/index.vue | 11 + TUIKit/components/common/Avatar/index.vue | 6 +- TUIKit/constant.ts | 6 +- components/share-popup/share-popup.vue | 449 +++++++++ pages/login/login.vue | 4 +- pages/mall/detail.vue | 15 +- pages/mall/list.vue | 1 - 12 files changed, 1368 insertions(+), 743 deletions(-) create mode 100644 components/share-popup/share-popup.vue diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-bubble.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-bubble.vue index e9e444d..ada9490 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-bubble.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-bubble.vue @@ -177,7 +177,7 @@ const props = withDefaults(defineProps(), { isAudioPlayed: false, - messageItem: () => ({} as IMessageModel), + messageItem: () => ({}) as IMessageModel, content: () => ({}), blinkMessageIDList: () => [], classNameList: () => [], @@ -411,7 +411,7 @@ } .content-out { - background: #00D9C5; + background: #00d9c5; border-radius: 10px 0 10px 10px; } diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-quote/index.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-quote/index.vue index 2e01982..b4b2a38 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-quote/index.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-quote/index.vue @@ -3,197 +3,233 @@ v-if="hasQuoteContent" :class="{ 'reference-content': true, - 'reverse': message.flow === 'out', + reverse: message.flow === 'out' }" @click="scrollToOriginalMessage" > -
+
{{ TUITranslateService.t('TUIChat.引用内容已撤回') }}
-
- {{ messageQuoteContent.messageSender }}: {{ transformTextWithKeysToEmojiNames(messageQuoteText) }} +
+ {{ messageQuoteContent.messageSender }}: + {{ transformTextWithKeysToEmojiNames(messageQuoteText) }}
diff --git a/TUIKit/components/TUIChat/message-list/message-tool/index.vue b/TUIKit/components/TUIChat/message-list/message-tool/index.vue index 592c472..7dc97f1 100644 --- a/TUIKit/components/TUIChat/message-list/message-tool/index.vue +++ b/TUIKit/components/TUIChat/message-list/message-tool/index.vue @@ -4,10 +4,7 @@ ref="messageToolDom" :class="['dialog-item', !isPC ? 'dialog-item-h5' : 'dialog-item-web']" > - +
- + {{ item.text }}
@@ -32,422 +26,505 @@ diff --git a/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue b/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue index ecb0ef1..b5d5c31 100644 --- a/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue +++ b/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue @@ -1,5 +1,10 @@ diff --git a/TUIKit/components/TUIContact/contact-list/index.vue b/TUIKit/components/TUIContact/contact-list/index.vue index d972b8c..b558a93 100644 --- a/TUIKit/components/TUIContact/contact-list/index.vue +++ b/TUIKit/components/TUIContact/contact-list/index.vue @@ -254,7 +254,6 @@ } else { currentContactListKey.value = key TUIStore.update(StoreName.CUSTOM, 'currentContactListKey', key) - if (key === 'friendApplicationList') { TUIFriendService.setFriendApplicationRead() } diff --git a/TUIKit/components/TUIConversation/conversation-list/index.vue b/TUIKit/components/TUIConversation/conversation-list/index.vue index 455063e..d287552 100644 --- a/TUIKit/components/TUIConversation/conversation-list/index.vue +++ b/TUIKit/components/TUIConversation/conversation-list/index.vue @@ -365,6 +365,7 @@ } return false } + /** 红包文案 */ const redEnvelopeText = (item: IConversationModel) => { const payload = JSON.parse(item.lastMessage?.payload?.data) @@ -379,12 +380,22 @@ /** 是否最开始创建群聊 */ const isFirstCreateGroup = (item: IConversationModel) => { + // 打印 if (item.type === 'GROUP' && item?.lastMessage?.payload?.data) { const data = JSON.parse(item?.lastMessage?.payload?.data) return data.content === 'Create Group' ? `${item.getLastMessage('text')?.split(':')[0]}:创建群聊` : '' } + if (item?.lastMessage?.payload?.data) { + const data = JSON.parse(item?.lastMessage?.payload?.data) + if (data.businessID === CHAT_MSG_CUSTOM_TYPE.GOODS) { + console.log(item, '==2222222=') + + return `自定义数据--` + } + return '' + } return '' } diff --git a/TUIKit/components/common/Avatar/index.vue b/TUIKit/components/common/Avatar/index.vue index 8091cf9..a7767e8 100644 --- a/TUIKit/components/common/Avatar/index.vue +++ b/TUIKit/components/common/Avatar/index.vue @@ -108,6 +108,7 @@ } .avatar-container { + flex-shrink: 0; position: relative; justify-content: center; align-items: center; @@ -121,7 +122,9 @@ width: 100%; height: 100%; background-color: #ececec; - transition: opacity 0.3s, background-color 0.1s ease-out; + transition: + opacity 0.3s, + background-color 0.1s ease-out; &.skeleton-animation { animation: breath 2s linear 0.3s infinite; @@ -134,6 +137,7 @@ } .avatar-image { + flex-shrink: 0; width: 80rpx !important; height: 80rpx !important; border-radius: 80rpx !important; diff --git a/TUIKit/constant.ts b/TUIKit/constant.ts index 8215021..3ce9379 100644 --- a/TUIKit/constant.ts +++ b/TUIKit/constant.ts @@ -19,7 +19,11 @@ export const CHAT_MSG_CUSTOM_TYPE = { CALL: 1, ORDER: "order", /** 红包 */ - RED_ENVELOPE: "redEnvelope" + RED_ENVELOPE: "redEnvelope", + /** 商品详情 */ + GOODS: "goods", + /** 直播 */ + LIVE: "live" }; export const DIALOG_CONTENT = { diff --git a/components/share-popup/share-popup.vue b/components/share-popup/share-popup.vue new file mode 100644 index 0000000..94d7b47 --- /dev/null +++ b/components/share-popup/share-popup.vue @@ -0,0 +1,449 @@ + + + + + diff --git a/pages/login/login.vue b/pages/login/login.vue index c84d3c8..dcae924 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -69,7 +69,9 @@ 登录 diff --git a/pages/mall/detail.vue b/pages/mall/detail.vue index 16a9093..d4a147f 100644 --- a/pages/mall/detail.vue +++ b/pages/mall/detail.vue @@ -10,6 +10,8 @@ const groupId = ref('') /** 评论数量 */ const commentNum = ref(0) + /** 分享弹窗 */ + const shareDialog = ref(false) const getData = async productId => { const res = await getProductDetail(productId) viewData.value = res.data @@ -69,13 +71,14 @@ class="left-icon" > - + @@ -158,6 +161,14 @@ 拼单购买 + + + diff --git a/pages/mall/list.vue b/pages/mall/list.vue index e940246..8df6217 100644 --- a/pages/mall/list.vue +++ b/pages/mall/list.vue @@ -61,7 +61,6 @@ :default-page-size="formData.pageSize" safe-area-inset-bottom use-safe-area-placeholder - :show-loading-more-no-more-view="false" :paging-style="{ 'background-color': '#f9f9f9' }" @query="getListData" >