diff --git a/components.d.ts b/components.d.ts index b178d34..58e27a4 100644 --- a/components.d.ts +++ b/components.d.ts @@ -52,6 +52,7 @@ declare module 'vue' { NButton: typeof import('naive-ui')['NButton'] NEmpty: typeof import('naive-ui')['NEmpty'] NIcon: typeof import('naive-ui')['NIcon'] + NImage: typeof import('naive-ui')['NImage'] NInput: typeof import('naive-ui')['NInput'] NModal: typeof import('naive-ui')['NModal'] NoticeEditor: typeof import('./src/components/group/manage/NoticeEditor.vue')['default'] diff --git a/src/api/auth.js b/src/api/auth.js index 779fe4d..ce636eb 100644 --- a/src/api/auth.js +++ b/src/api/auth.js @@ -25,3 +25,7 @@ export const ServeRefreshToken = () => { export const ServeForgetPassword = (data) => { return post('/api/v1/auth/forget', data) } +// 获取用户信息服务 +export const GetUserInfo = (data) => { + return post('/api/v1/users/info', data) +} \ No newline at end of file diff --git a/src/api/contact.js b/src/api/contact.js index cfdba05..0259036 100644 --- a/src/api/contact.js +++ b/src/api/contact.js @@ -45,10 +45,12 @@ export const ServeFindFriendApplyNum = () => { } // 搜索用户信息服务接口 +// export const ServeSearchUser = (data) => { +// return get('/api/v1/contact/detail', data) +// } export const ServeSearchUser = (data) => { - return get('/api/v1/contact/detail', data) + return post('/api/v1/users/info', data) } - // 搜索用户信息服务接口 export const ServeContactGroupList = (data) => { return get('/api/v1/contact/group/list', data) diff --git a/src/assets/css/define/theme.less b/src/assets/css/define/theme.less index ada3007..cb12e6d 100644 --- a/src/assets/css/define/theme.less +++ b/src/assets/css/define/theme.less @@ -1,6 +1,6 @@ // 默认主题 html { - --im-primary-color: #1890ff; + --im-primary-color: #462AA0; --im-bg-color: #ffffff; --line-border-color: #f5f5f5; --border-color: #eeeaea; diff --git a/src/assets/image/excel-icon.png b/src/assets/image/excel-icon.png new file mode 100644 index 0000000..f831d06 Binary files /dev/null and b/src/assets/image/excel-icon.png differ diff --git a/src/assets/image/excel-text.png b/src/assets/image/excel-text.png new file mode 100644 index 0000000..5c115ae Binary files /dev/null and b/src/assets/image/excel-text.png differ diff --git a/src/assets/image/file-icon.png b/src/assets/image/file-icon.png new file mode 100644 index 0000000..a266565 Binary files /dev/null and b/src/assets/image/file-icon.png differ diff --git a/src/assets/image/file-text.png b/src/assets/image/file-text.png new file mode 100644 index 0000000..c2b433a Binary files /dev/null and b/src/assets/image/file-text.png differ diff --git a/src/assets/image/file-paper-line@2x.png b/src/assets/image/pdf-icon.png similarity index 100% rename from src/assets/image/file-paper-line@2x.png rename to src/assets/image/pdf-icon.png diff --git a/src/assets/image/pdf-text.png b/src/assets/image/pdf-text.png new file mode 100644 index 0000000..8856961 Binary files /dev/null and b/src/assets/image/pdf-text.png differ diff --git a/src/assets/image/ppt-icon.png b/src/assets/image/ppt-icon.png new file mode 100644 index 0000000..2498d71 Binary files /dev/null and b/src/assets/image/ppt-icon.png differ diff --git a/src/assets/image/ppt-text.png b/src/assets/image/ppt-text.png new file mode 100644 index 0000000..80a7a51 Binary files /dev/null and b/src/assets/image/ppt-text.png differ diff --git a/src/assets/image/word-icon.png b/src/assets/image/word-icon.png new file mode 100644 index 0000000..ced9c71 Binary files /dev/null and b/src/assets/image/word-icon.png differ diff --git a/src/assets/image/word-text.png b/src/assets/image/word-text.png new file mode 100644 index 0000000..3b7a753 Binary files /dev/null and b/src/assets/image/word-text.png differ diff --git a/src/components/talk/message/FileMessage.vue b/src/components/talk/message/FileMessage.vue index f45592c..bc339ea 100644 --- a/src/components/talk/message/FileMessage.vue +++ b/src/components/talk/message/FileMessage.vue @@ -1,7 +1,12 @@ diff --git a/src/components/talk/message/VideoMessage.vue b/src/components/talk/message/VideoMessage.vue index 8cc9c7a..3c7ea80 100644 --- a/src/components/talk/message/VideoMessage.vue +++ b/src/components/talk/message/VideoMessage.vue @@ -100,7 +100,7 @@ async function onPlay() { function pauseUpload(e) { e.stopPropagation() if (props.extra.is_uploading && props.extra.upload_id) { - uploadsStore.pauseVideoUpload(props.extra.upload_id) + uploadsStore.pauseUpload(props.extra.upload_id) isPaused.value = true } } @@ -110,7 +110,7 @@ function resumeUpload(e) { console.log('resumeUpload') e.stopPropagation() if (props.extra.is_uploading && props.extra.upload_id) { - uploadsStore.resumeVideoUpload(props.extra.upload_id) + uploadsStore.resumeUpload(props.extra.upload_id) isPaused.value = false } } @@ -123,7 +123,7 @@ function retryUpload(e) { uploadFailed.value = false // 恢复上传 - uploadsStore.resumeVideoUpload(props.extra.upload_id) + uploadsStore.resumeUpload(props.extra.upload_id) message.success('正在重新上传视频...') } } diff --git a/src/components/user/ContactModal.vue b/src/components/user/ContactModal.vue index e278080..ad8d1a5 100644 --- a/src/components/user/ContactModal.vue +++ b/src/components/user/ContactModal.vue @@ -4,7 +4,7 @@ import { NModal, NInput, NScrollbar, NCheckbox, NTabs, NTab } from 'naive-ui' import { Search, Delete } from '@icon-park/vue-next' import { ServeGetContacts } from '@/api/contact' import { ServeGetGroups } from '@/api/group' - +import XNModal from '@/components/x-naive-ui/x-n-modal/index.vue' const emit = defineEmits(['close', 'on-submit']) interface Item { @@ -130,20 +130,12 @@ onLoad() - +