diff --git a/env/.env.test b/env/.env.test index 43930b6..0382513 100644 --- a/env/.env.test +++ b/env/.env.test @@ -7,6 +7,6 @@ VUE_APP_PREVIEW=false #VITE_SOCKET_API=ws://192.168.88.21:9504 VITE_BASE_API=http://114.218.158.24:8503 VITE_SOCKET_API=ws://114.218.158.24:8504 -VITE_EPR_BASEURL=http://114.218.158.24:9020 +VITE_EPR_BASEURL=http://172.16.100.93:8503 VITE_PAGE_URL=http://172.16.100.93:9032 VUE_APP_WEBSITE_NAME="" \ No newline at end of file diff --git a/src/views/message/inner/IndexContent.vue b/src/views/message/inner/IndexContent.vue index 3836627..e2ad11e 100644 --- a/src/views/message/inner/IndexContent.vue +++ b/src/views/message/inner/IndexContent.vue @@ -146,7 +146,7 @@ watch( ServeCheckFriend({ receiver_id: newValue.receiver_id, talk_type: 1 }).then((res) => { if (res?.code === 200) { console.log(res, 'ress') - isFriend.value = !res.data.is_friend + isFriend.value = res.data.is_friend } }) } @@ -537,7 +537,7 @@ const clearSelectedDateTime = () => {
{ // userStore.getUserInfo(uid) // } // 置底按钮 const skipBottom = ref(false) +const goToMessage = (result) => { + const talk_type = props.talk_type + const receiver_id = props.receiver_id + dialogueStore.specifiedMsg = encodeURIComponent( + JSON.stringify({ + talk_type, + receiver_id, + msg_id: result.msg_id, + cursor: result.sequence - 15 > 0 ? result.sequence - 15 : 0, + direction: 'down', + sort_sequence: 'asc', + create_time: result.created_at + }) + ) + talkStore.toTalk(talk_type, receiver_id, router) +} // 是否显示消息时间 const isShowTalkTime = (index: number, datetime: string) => { if (datetime == undefined) { @@ -330,15 +350,16 @@ const onContextMenuHandle = (key: string) => { } const onRowClick = (item: ITalkRecord) => { - if (dialogueStore.isOpenMultiSelect && isOneMonthBefore(item.created_at.split(' ')[0])) { + if (dialogueStore.isOpenMultiSelect) { + if (!isOneMonthBefore(item.created_at.split(' ')[0])) { + return useMessage.info('只支持转发近一个月内的消息') + } console.log('item.msg_type', item.msg_type) if (ForwardableMessageType.includes(item.msg_type)) { item.isCheck = !item.isCheck } else { useMessage.info('此类消息不支持转发') } - } else { - useMessage.info('只支持转发近一个月内的消息') } } @@ -919,11 +940,11 @@ const onCustomSkipBottomEvent = () => {
-->
- +
@@ -1068,6 +1089,7 @@ const onCustomSkipBottomEvent = () => { &.border { border-radius: 10px; border: 1px solid var(--im-primary-color); + background-color: red; } }