diff --git a/env/.env.test b/env/.env.test index e7f905e..43930b6 100644 --- a/env/.env.test +++ b/env/.env.test @@ -8,4 +8,5 @@ VUE_APP_PREVIEW=false 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_PAGE_URL=http://172.16.100.93:9032 VUE_APP_WEBSITE_NAME="" \ No newline at end of file diff --git a/src/components/editor/Editor.vue b/src/components/editor/Editor.vue index fef3e47..fc15f55 100644 --- a/src/components/editor/Editor.vue +++ b/src/components/editor/Editor.vue @@ -437,8 +437,7 @@ function onClipboardMatcher(node: any, Delta) { function onSendMessage() { var delta = getQuill().getContents() let data = deltaToMessage(delta) // 转换Delta为消息格式 - - if (data.items.length === 0) { + if (data.items.length === 0||!data.items[0].content.trim()) { return // 没有内容不发送 } diff --git a/src/components/talk/message/FileMessage.vue b/src/components/talk/message/FileMessage.vue index 9653726..5649a89 100644 --- a/src/components/talk/message/FileMessage.vue +++ b/src/components/talk/message/FileMessage.vue @@ -88,7 +88,7 @@ const strokeDashoffset = computed(() => const handleClick = () => { if(!props.extra.is_uploading){ window.open( - `${window.location.origin}/office?url=${props.extra.path}`, + `${import.meta.env.VITE_PAGE_URL}/office?url=${props.extra.path}`, '_blank', 'width=1200,height=900,left=200,top=200,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,location=no,status=no' ); diff --git a/src/hooks/useFriendsMenu.ts b/src/hooks/useFriendsMenu.ts index 81b5e85..d7d1ea2 100644 --- a/src/hooks/useFriendsMenu.ts +++ b/src/hooks/useFriendsMenu.ts @@ -21,7 +21,7 @@ export function useFriendsMenu() { dropdown.item = Object.assign({}, item) dropdown.options = [] - dropdown.options.push({ label: '删除好友', key: 'delete' }) + // dropdown.options.push({ label: '删除好友', key: 'delete' }) dropdown.x = e.clientX dropdown.y = e.clientY diff --git a/src/hooks/useSessionMenu.ts b/src/hooks/useSessionMenu.ts index 3bed761..7762996 100644 --- a/src/hooks/useSessionMenu.ts +++ b/src/hooks/useSessionMenu.ts @@ -71,11 +71,11 @@ export function useSessionMenu() { }) if (item.talk_type == 1) { - options.push({ + // options.push({ - label: '删除好友', - key: 'delete_contact' - }) + // label: '删除好友', + // key: 'delete_contact' + // }) } else { options.push({ @@ -107,9 +107,7 @@ export function useSessionMenu() { } const onUserInfo = (item: ISession) => { - console.error('item',item) - - user(item.id) + user(item.erp_user_id) } // 移除会话 diff --git a/src/types/chat.ts b/src/types/chat.ts index fe75240..f289505 100644 --- a/src/types/chat.ts +++ b/src/types/chat.ts @@ -27,6 +27,7 @@ export interface ISession { content?: string // 消息内容 last_message?: ISessionLastMessage draft_text?: string // 草稿文本 + erp_user_id:number } // 消息记录 diff --git a/src/utils/auth.js b/src/utils/auth.js index 786e2c0..f4f176c 100644 --- a/src/utils/auth.js +++ b/src/utils/auth.js @@ -18,7 +18,7 @@ export function isLoggedIn() { */ export function getAccessToken() { // return storage.get(AccessToken) || '' - return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22a02b52442e2e6a79ca35b2fa54a4bb215abd3b9cc8ad2ef018b380a88e93a2fc55fb3e36695ae76a0ea52c973374861c70339249f89f36d787b0dfa7fc99339470dbc626eb5ff42232137ef97447e79f' + return JSON.parse(localStorage.getItem('token'))||'46d71a72d8d845ad7ed23eba9bdde260e635407190c2ce1bf7fd22088e41682ea07773ec65cae8946d2003f264d55961f96e0fc5da10eb96d3a348c1664e9644ce2108c311309f398ae8ea1b8200bfd490e5cb6e8c52c9e5d493cbabb163368f8351420451a631dbfa749829ee4cda49b77b5ed2d3dced5d0f2b7dd9ee76ba5465c84a17c23af040cd92b6b2a4ea48befbb5c729dcdad0a9c9668befe84074cc24f78899c1d947f8e7f94c7eda5325b8ed698df729e76febb98549ef3482ae942fb4f4a1c92d21836fa784728f0c5483aab2760a991b6b36e6b10c84f840a6433a6ecc31dee36e8f1c6158818bc89d22726726265e9af0db370a54ea5ee002b43662d571b84c8468ac15330f79503a5cd5e72282d8bee92749b1a3c1b7fd87ae70b64b90e437e84c1b558c64a35e181b2ecf5db3007680c3607eac1edee7f59d' } /** diff --git a/src/views/message/inner/panel/PanelContent.vue b/src/views/message/inner/panel/PanelContent.vue index 1540e6a..5cb1cc9 100644 --- a/src/views/message/inner/panel/PanelContent.vue +++ b/src/views/message/inner/panel/PanelContent.vue @@ -1,6 +1,6 @@ @@ -737,11 +356,6 @@ const loadMoreReadListDetail = () => { v-for="(item, index) in records" :key="item.msg_id" :id="item.msg_id" - :data-msgid="item.msg_id" - :data-msgtype="item.msg_type" - :data-userid="item.user_id" - :data-talktype="props?.talk_type" - :data-receiverid="props?.receiver_id" > @@ -775,11 +389,7 @@ const loadMoreReadListDetail = () => { > @@ -807,8 +417,10 @@ const loadMoreReadListDetail = () => { {{ parseTime(item.created_at, '{y}/{m}/{d} {h}:{i}') }} --> - {{ item.nickname }} + {{ item.nickname }} {{ parseTime(item.created_at, '{y}/{m}/{d} {h}:{i}') }} @@ -867,72 +479,6 @@ const loadMoreReadListDetail = () => { {{ item.extra?.reply?.content }} - - - - {{ - item.read_total_num > 0 ? '已读' : '未读' - }} - - - - 已读 ({{ item?.read_total_num || 0 }}/{{ - props.num - 1 > 0 ? props.num - 1 : 0 - }}) - - - - - - {{ `未读(${props.num - 1 - (item.read_total_num || 0) || 0})` }} - - - {{ `已读(${item.read_total_num || 0})` }} - - - - - - - - {{ - talkReadDetailItem.nickName - }} - {{ - talkReadDetailItem.jobNum - }} - - - - - - - @@ -1131,17 +677,6 @@ const loadMoreReadListDetail = () => { } } - .talk_read_num { - text-align: right; - color: #7a58de; - font-size: 12px; - font-weight: 400; - line-height: 17px; - margin: 5px 0 0; - span { - } - } - &:hover { .talk-title { opacity: 1; @@ -1190,31 +725,4 @@ const loadMoreReadListDetail = () => { } } } - -.talk-read-list-detail { - width: 341px; - padding: 0 14px; - - .talk-read-list { - .talk-read-list-item { - display: flex; - flex-direction: row; - align-items: center; - justify-content: flex-start; - gap: 10px; - padding: 10px 0; - border-bottom: 1px solid #f1f1f1; - - .talk-read-list-item-info { - display: flex; - flex-direction: column; - align-items: flex-start; - justify-content: center; - - span { - } - } - } - } -} diff --git a/vite.config.ts b/vite.config.ts index 715bc77..83a792e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,9 +46,9 @@ export default defineConfig(({ mode }) => { vueJsx({}), compressPlugin(), UnoCSS(), - // vueDevTools({ - // launchEditor: 'trae', - // }) + vueDevTools({ + launchEditor: 'trae', + }) ], define: { __APP_ENV__: env.APP_ENV