diff --git a/src/components/talk/message/LinkMessage.vue b/src/components/talk/message/LinkMessage.vue
new file mode 100644
index 0000000..f58c82e
--- /dev/null
+++ b/src/components/talk/message/LinkMessage.vue
@@ -0,0 +1,95 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/constant/message.ts b/src/constant/message.ts
index 1ddfe37..e983c3f 100644
--- a/src/constant/message.ts
+++ b/src/constant/message.ts
@@ -11,6 +11,7 @@ export const ChatMsgTypeLogin = 10 // 登录消息
export const ChatMsgTypeVote = 11 // 投票消息
export const ChatMsgTypeMixed = 12 // 混合消息
export const ChatMsgTypeGroupNotice = 13 // 群公告消息
+export const ChatMsgTypeLink = 14 // 链接消息
export const ChatMsgSysText = 1000 // 系统文本消息
export const ChatMsgSysGroupCreate = 1101 // 创建群聊消息
@@ -40,6 +41,7 @@ export const ChatMsgTypeMapping = {
[ChatMsgTypeCode]: '[代码消息]',
[ChatMsgTypeMixed]: '[图文消息]',
[ChatMsgTypeGroupNotice]: '[群公告]',
+ [ChatMsgTypeLink]: '[链接]',
[ChatMsgSysText]: '[系统消息]',
[ChatMsgSysGroupCreate]: '[创建群消息]',
[ChatMsgSysGroupMemberJoin]: '[加入群消息]',
@@ -69,6 +71,7 @@ export const MessageComponents = {
[ChatMsgTypeCode]: 'code-message',
[ChatMsgTypeMixed]: 'mixed-message',
[ChatMsgTypeGroupNotice]: 'group-notice-message',
+ [ChatMsgTypeLink]: 'link-message',
[ChatMsgSysText]: 'sys-text-message',
[ChatMsgSysGroupCreate]: 'sys-group-create-message',
[ChatMsgSysGroupMemberJoin]: 'sys-group-join-message',
@@ -92,5 +95,6 @@ export const ForwardableMessageType = [
ChatMsgTypeVideo,
ChatMsgTypeFile,
ChatMsgTypeLocation,
- ChatMsgTypeCard
+ ChatMsgTypeCard,
+ ChatMsgTypeLink
]
diff --git a/src/pages/chatSettings/components/settingFormItem.vue b/src/pages/chatSettings/components/settingFormItem.vue
index fcf7639..a48df44 100644
--- a/src/pages/chatSettings/components/settingFormItem.vue
+++ b/src/pages/chatSettings/components/settingFormItem.vue
@@ -115,6 +115,7 @@ const changeSwitch = (e, item) => {
flex-direction: row;
align-items: center;
justify-content: flex-end;
+ padding: 0 0 0 20rpx;
span {
line-height: 44rpx;
color: #747474;
diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue
index c38920a..6f6f5aa 100644
--- a/src/pages/chatSettings/index.vue
+++ b/src/pages/chatSettings/index.vue
@@ -21,12 +21,15 @@
{{ groupName }}
-
+
{{ '(' + groupNum + ')' }}
{{ state?.userInfo?.nickname }}
-
+
{{ $t('user.info.jobNum') + ':' + state?.userInfo?.job_num }}
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index 1265976..a0edf78 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -8,12 +8,8 @@
:hide-empty-view="true"
height="100%"
ref="zpagingRef"
- :use-virtual-list="true"
- :preload-page="1"
- cell-height-mode="dynamic"
- virtual-scroll-fps="80"
+ v-model="virtualList"
:loading-more-custom-style="{ display: 'none', height: '0' }"
- @virtualListChange="virtualListChange"
@scrolltolower="onRefreshLoad"
>
@@ -45,7 +41,7 @@
-->
-
+
@@ -409,7 +406,18 @@ const handleFilePanel = () => {
state.value.isOpenFilePanel = !state.value.isOpenFilePanel
}
-const onSendMessage = (data = {}) => {
+//点击隐藏表情/文件上传 面板
+const handleHidePanel = () => {
+ state.value.isOpenFilePanel = false
+ state.value.isOpenEmojiPanel = false
+}
+
+//点击编辑区聚焦输入框
+const onEditorClick = () => {
+ handleHidePanel()
+}
+
+const onSendMessage = (data = {}, callBack) => {
let message = {
...data,
receiver: {
@@ -421,7 +429,9 @@ const onSendMessage = (data = {}) => {
ServePublishMessage(message)
.then(({ code, message }) => {
if (code == 200) {
- // callBack(true)
+ if (callBack) {
+ callBack(true)
+ }
} else {
message.warning(message)
}
@@ -466,7 +476,7 @@ const onSendTextEvent = lodash.throttle((value) => {
mentions: data.mentionUids,
}
- onSendMessage(message)
+ onSendMessage(message, callBack)
}, 1000)
// 编辑器输入事件
@@ -823,7 +833,7 @@ const initData = async () => {
no_limit: dialogueList ? 1 : 0,
}
await onLoad({ ...objT })
- zpagingRef.value?.complete(records.value)
+ zpagingRef.value?.setLocalPaging(records.value)
}
//点击跳转到聊天设置页面
diff --git a/src/pages/index/components/chatItem.vue b/src/pages/index/components/chatItem.vue
index da80952..3a892b7 100644
--- a/src/pages/index/components/chatItem.vue
+++ b/src/pages/index/components/chatItem.vue
@@ -31,8 +31,12 @@
-
-
{{ props.data.name }}
+
+
+ {{ props.data.name }}
+
部门
@@ -43,7 +47,10 @@
公司
-
+
{{ beautifyTime(props.data.updated_at) }}
@@ -57,7 +64,7 @@
-
+
-
-
+
-
-
-
-
-
-
-
- {{ userStore.nickname }}
-
-
-
-
-
-
-
-
-
-
-
-
+ :show-scrollbar="false"
+ >
+
+
+
+
+
+
+
+ {{ userStore.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
diff --git a/src/uni_modules/tmui/components/tm-navbar/tm-navbar.vue b/src/uni_modules/tmui/components/tm-navbar/tm-navbar.vue
index bde0c51..1e72577 100644
--- a/src/uni_modules/tmui/components/tm-navbar/tm-navbar.vue
+++ b/src/uni_modules/tmui/components/tm-navbar/tm-navbar.vue
@@ -1,78 +1,98 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+