diff --git a/components.d.ts b/components.d.ts
index 0dae289..5202040 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -30,6 +30,8 @@ declare module 'vue' {
LoginMessage: typeof import('./src/components/talk/message/LoginMessage.vue')['default']
Message: typeof import('./src/components/x-message/message/index.vue')['default']
MixedMessage: typeof import('./src/components/talk/message/MixedMessage.vue')['default']
+ NButton: typeof import('naive-ui')['NButton']
+ NIcon: typeof import('naive-ui')['NIcon']
PageAnimation: typeof import('./src/components/page-animation/index.vue')['default']
RevokeMessage: typeof import('./src/components/talk/message/RevokeMessage.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/App.vue b/src/App.vue
index db49d9c..acd16a7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,12 +11,12 @@ const userStore = useUserStore()
const root = document.documentElement
root.style.setProperty('--statusBarHeight', `${statusBarHeight.value}px`)
const handleWebview = () => {
- let statusBarHeight = window?.plus?.navigator?.getStatusbarHeight()
+ let statusBarHeight_ = window?.plus?.navigator?.getStatusbarHeight()
const webview = plus.webview.currentWebview()
- webview.setStyle({
- top: statusBarHeight,
- bottom: 0,
- })
+ // webview.setStyle({
+ // top: statusBarHeight_,
+ // bottom: 0,
+ // })
// console.log(webview)
token.value = webview.token
}
diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
index faf7093..99cc23e 100644
--- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@@ -684,6 +684,8 @@ const confirmSelectMembers = () => {
resp.then(({ code, data }) => {
console.log(data)
if (code == 200) {
+ // console.error(-selectedUserIds.split(',').length)
+ emits('updateSelectedMembersNum', -selectedUserIds.split(',').length)
useDialogueStore().updateGroupMembers()
groupStore.ServeGroupDetail()
} else {
diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue
index b593797..a6c48c8 100644
--- a/src/pages/chatSettings/index.vue
+++ b/src/pages/chatSettings/index.vue
@@ -262,7 +262,9 @@ onLoad(async (options) => {
console.log(options.groupId)
state.groupId = Number(options.groupId)
await groupStore.ServeGroupDetail()
- await groupStore.ServeGetGroupNotices()
+ if (dialogueParams.type === 2) {
+ await groupStore.ServeGetGroupNotices()
+ }
}
if (options.sessionId) {
state.sessionId = Number(options.sessionId)
diff --git a/src/pages/chooseByDeps/index.vue b/src/pages/chooseByDeps/index.vue
index c75b162..e99187f 100644
--- a/src/pages/chooseByDeps/index.vue
+++ b/src/pages/chooseByDeps/index.vue
@@ -2,8 +2,11 @@
-
-
+
+
+
+
{{ item.name }}
-
{{ item.name }}
-
-
-
+
+
公司群
-
+
-
- 重新编辑
-
+
+
+ 重新编辑
+
+
@@ -133,7 +145,7 @@
onContextMenu(menuType, item)"
:isShowCopy="isShowCopy(item)"
- :isShowWithdraw="isRevoke(talkParams.uid, item)"
+ :isShowWithdraw="isRevoke(talkParams.uid, item) || isLeader"
>
dialogueStore.online),
keyboard: computed(() => dialogueStore.keyboard),
num: computed(() => dialogueStore.members.length),
+ isDismiss: computed(() => dialogueStore.isDismiss),
+ adminList: computed(() => dialogueStore.getAdminList),
})
const state = ref({
@@ -768,8 +782,8 @@ const onEditorChange = () => {
// emit('editor-event', emitCall('input_event', text))
// 清理过期的撤回消息(超过5分钟)
const now = new Date().getTime()
- Object.keys(state.value.revokedMessages).forEach(msgId => {
- if ((now - state.value.revokedMessages[msgId].revokeTime) > 5 * 60 * 1000) {
+ Object.keys(state.value.revokedMessages).forEach((msgId) => {
+ if (now - state.value.revokedMessages[msgId].revokeTime > 5 * 60 * 1000) {
delete state.value.revokedMessages[msgId]
}
})
@@ -932,27 +946,26 @@ const withdrawerConfirm = () => {
// 添加检查是否可以重新编辑撤回消息的函数
const canEditRevokedMessage = (item) => {
- console.log( item)
- if(item.is_revoke === 1 && item.msg_type === 1) {
- const now = new Date().getTime();
- const revokeTime = new Date(item.created_at).getTime();
+ console.log(item)
+ if (item.is_revoke === 1 && item.msg_type === 1) {
+ const now = new Date().getTime()
+ const revokeTime = new Date(item.created_at).getTime()
console.log(now)
// 检查是否在5分钟内
- return (now - revokeTime) <= 5 * 60 * 1000
+ return now - revokeTime <= 5 * 60 * 1000
}
return false
-
}
// 添加恢复撤回消息到输入框的函数
const restoreRevokedMessage = async (item) => {
// 接口拿数据,之后把查询的内容给输入框
const res = await detailGetRecordsContext({
- msgId: item.msg_id
+ msgId: item.msg_id,
})
console.log(res)
- if(res.code == 200) {
- const content = res.data.item?.extra?.content;
+ if (res.code == 200) {
+ const content = res.data.item?.extra?.content
const quill = getQuill()
quill.setText(content)
// 将光标设置到文本末尾
@@ -970,7 +983,6 @@ const restoreRevokedMessage = async (item) => {
// 可以根据需要添加其他类型消息的处理
}
-
const actionDelete = (item) => {
console.log('删除')
item.isCheck = true
@@ -1290,7 +1302,32 @@ const queryRecordsByMsgInfo = (msgInfo) => {
}
}
+//是否是管理员
+const isLeader = computed(() => {
+ if (talkParams.adminList.length > 0) {
+ return (
+ talkParams.adminList.filter(
+ (adminItem) => adminItem.erp_user_id === useAuth()?.userInfo?.value?.ID,
+ ).length > 0
+ )
+ }
+ return false
+})
+
onMounted(async () => {
+ if (typeof plus !== 'undefined') {
+ const webview = plus.webview.currentWebview()
+ webview.setStyle({
+ bottom: 0,
+ })
+ } else {
+ document.addEventListener('plusready', () => {
+ const webview = plus.webview.currentWebview()
+ webview.setStyle({
+ bottom: 0,
+ })
+ })
+ }
nextTick(() => {
state.value.mentionSelectHeight = pxTorPx(
uni.getSystemInfoSync().windowHeight * 0.86,
@@ -1340,7 +1377,7 @@ onUnmounted(() => {
.edit-revoked-message {
margin-left: 10rpx;
- color: #46299D;
+ color: #46299d;
cursor: pointer;
font-size: 24rpx;
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 53c7b02..8e33128 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -131,6 +131,7 @@ import addCircle from '@/static/image/chatList/addCircle.png'
import cahtPopover from '@/static/image/chatList/cahtPopover.png'
import zu3289 from '@/static/image/chatList/zu3289@2x.png'
import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+import { handleSetWebviewStyle } from '@/utils/common'
const paging = ref()
const isEmptyViewShow = ref(false)
const talkStore = useTalkStore()
@@ -214,6 +215,7 @@ const toAddressBookPage = () => {
); */
onShow(() => {
+ handleSetWebviewStyle(true)
// 页面显示时重新加载数据
talkStore
.loadTalkList()
diff --git a/src/pages/search/index.vue b/src/pages/search/index.vue
index d0c6c13..b84a80b 100644
--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@@ -14,6 +14,12 @@