Merge branch 'wyfMain-dev'

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']

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({
+  // webview.setStyle({
-    top: statusBarHeight,
+  //   top: statusBarHeight_,
-    bottom: 0,
+  //   bottom: 0,
-  })
+  // })
   // console.log(webview)
   token.value = webview.token
 }

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 {

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)

src/pages/chooseByDeps/index.vue

@@ -2,8 +2,11 @@
   <div class="choose-deps-page">
     <zPaging ref="zPaging" :show-scrollbar="false">
       <template #top>
-        <div :class="state.chooseMode === 3 ? 'top_bg': ''">
+        <div :class="state.chooseMode === 3 ? 'top_bg' : ''">
-          <customNavbar :class="state.chooseMode === 3 ? 'index_top_navbar': ''" :title="pageTitle"></customNavbar>
+          <customNavbar
+            :class="state.chooseMode === 3 ? 'index_top_navbar' : ''"
+            :title="pageTitle"
+          ></customNavbar>
           <div class="pl-[32rpx] pr-[32rpx] pt-[32rpx] pb-[32rpx]">
             <customInput
               :searchText="searchVal"
@@ -14,33 +17,33 @@
       </template>
       <div class="choose-deps">
         <div class="w-full pl-[32rpx] pr-[32rpx]">
+          <div
+            v-if="crumbs.length"
+            class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
+            ref="crumbsContainer"
+          >
             <div
-              v-if="crumbs.length"
+              v-for="(item, index) in crumbs"
-              class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
+              class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
-              ref="crumbsContainer"
+              :class="[
+                index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
+                index === 0 ? '' : 'ml-[12rpx]',
+              ]"
+              @click="handleCrumbsClick(index)"
             >
+              <div>{{ item.name }}</div>
               <div
-                v-for="(item, index) in crumbs"
+                v-if="index !== crumbs.length - 1"
-                class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
+                class="ml-[20rpx] flex items-center mb-[2rpx]"
-                :class="[
-                  index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
-                  index === 0 ? '' : 'ml-[12rpx]',
-                ]"
-                @click="handleCrumbsClick(index)"
               >
-                <div>{{ item.name }}</div>
+                <tm-icon
-                <div
+                  name="tmicon-angle-right"
-                  v-if="index !== crumbs.length - 1"
+                  :font-size="20"
-                  class="ml-[20rpx] flex items-center mb-[2rpx]"
+                  :color="index !== crumbs.length - 1 ? '#7A58DE' : '#C1B4EA'"
-                >
+                ></tm-icon>
-                  <tm-icon
-                    name="tmicon-angle-right"
-                    :font-size="20"
-                    :color="index !== crumbs.length - 1 ? '#7A58DE' : '#C1B4EA'"
-                  ></tm-icon>
-                </div>
               </div>
             </div>
+          </div>
           <div
             v-if="
               (state.chooseMode === 1 || state.chooseMode === 2) &&
@@ -460,6 +463,7 @@ import downDep from '@/static/image/chatList/downDep.png'
 import downDepDis from '@/static/image/chatList/downDepDis.png'
 import checkBox from '@/components/checkBox/index.vue'
 import lodash from 'lodash'
+import { handleSetWebviewStyle } from '@/utils/common'
 
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
@@ -990,6 +994,7 @@ const checkCurrentItem = (item) => {
 }
 
 onMounted(() => {
+  handleSetWebviewStyle()
   init()
 })
 
@@ -1106,18 +1111,18 @@ const toUserDetail = (userItem) => {
   height: 100%;
   display: flex;
 }
-::v-deep .index_top_navbar .tmicon-angle-left{
+::v-deep .index_top_navbar .tmicon-angle-left {
-  color:#fff !important;
+  color: #fff !important;
 }
-::v-deep .index_top_navbar .text-weight-b{
+::v-deep .index_top_navbar .text-weight-b {
-  color:#fff !important;
+  color: #fff !important;
 }
 
 ::v-deep .index_top_navbar .statusHeightTop > .noNvueBorder:first-child {
   background: transparent !important;
   border: none !important;
 }
-.top_bg{
+.top_bg {
   background: url('@/static/image/mine/page_top.png') no-repeat;
   background-size: cover;
   background-position: bottom center;

src/pages/creatGroupChat/index.vue

@@ -186,7 +186,7 @@ import customBtn from '@/components/custom-btn/custom-btn.vue'
 import groupMemberList from '../chatSettings/components/groupMembersList.vue'
 import avatarModule from '@/components/avatar-module/index.vue'
 
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed, onMounted } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { useChatList } from '@/store/chatList/index.js'
 import { useAuth } from '@/store/auth'
@@ -195,6 +195,7 @@ import addCircle from '@/static/image/chatList/addCircle.png'
 import cahtPopover from '@/static/image/chatList/cahtPopover.png'
 import { ServeCreateGroup } from '@/api/group/index'
 import { useGroupTypeStore } from '@/store/groupType'
+import { handleSetWebviewStyle } from '@/utils/common'
 
 const {
   groupName,
@@ -217,6 +218,10 @@ onLoad(()=> {
   groupStore.$reset()
 })
 
+onMounted(() => {
+  handleSetWebviewStyle()
+})
+
 //群类型
 const groupType = computed(() => {
   let group_type = ''

src/pages/dialog/dialogDetail/userDetail.vue

@@ -115,7 +115,7 @@ const state = reactive({
   erpUserId: '', //erp用户id
   userInfo: null, //用户详情
   userBasicInfos: [], //用户基本信息
-  isShowPhoneCall: true, //是否显示电话拨号弹框
+  isShowPhoneCall: false, //是否显示电话拨号弹框
   phoneNumber: '', //手机号
 })
 

src/pages/dialog/index.vue

@@ -24,7 +24,10 @@
             <div class="text-[24rpx] text-[#999999]">公司群</div>
           </template>
           <template #right>
-            <div class="mr-[36rpx] toChatSetting_btn">
+            <div
+              class="mr-[36rpx] toChatSetting_btn"
+              v-if="!talkParams.isDismiss"
+            >
               <tm-icon
                 color="rgb(51, 51, 51)"
                 :font-size="36"
@@ -70,9 +73,18 @@
               :datetime="item.created_at"
               :msg_id="item.msg_id"
             >
-            <template v-if="canEditRevokedMessage(item) && item.user_id === userStore.uid">
+              <template
-              <span class="edit-revoked-message" @click="restoreRevokedMessage(item)">重新编辑</span>
+                v-if="
-            </template>
+                  canEditRevokedMessage(item) && item.user_id === userStore.uid
+                "
+              >
+                <span
+                  class="edit-revoked-message"
+                  @click="restoreRevokedMessage(item)"
+                >
+                  重新编辑
+                </span>
+              </template>
             </revoke-message>
           </div>
 
@@ -133,7 +145,7 @@
                 <deepBubble
                   @clickMenu="(menuType) => onContextMenu(menuType, item)"
                   :isShowCopy="isShowCopy(item)"
-                  :isShowWithdraw="isRevoke(talkParams.uid, item)"
+                  :isShowWithdraw="isRevoke(talkParams.uid, item) || isLeader"
                 >
                   <component
                     class="component-content"
@@ -479,7 +491,7 @@ import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZ
 import emojiPanel from './components/emojiPanel.vue'
 import filePanel from './components/filePanel.vue'
 import lodash from 'lodash'
-import { ServePublishMessage,detailGetRecordsContext } from '@/api/chat'
+import { ServePublishMessage, detailGetRecordsContext } from '@/api/chat'
 import copy07 from '@/static/image/chatList/copy07@2x.png'
 import multipleChoices from '@/static/image/chatList/multipleChoices@2x.png'
 import cite from '@/static/image/chatList/cite@2x.png'
@@ -522,6 +534,8 @@ const talkParams = reactive({
   online: computed(() => 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 => {
+  Object.keys(state.value.revokedMessages).forEach((msgId) => {
-    if ((now - state.value.revokedMessages[msgId].revokeTime) > 5 * 60 * 1000) {
+    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)
+  console.log(item)
-  if(item.is_revoke === 1 && item.msg_type === 1) {
+  if (item.is_revoke === 1 && item.msg_type === 1) {
-    const now = new Date().getTime();
+    const now = new Date().getTime()
-    const revokeTime = new Date(item.created_at).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) {
+  if (res.code == 200) {
-    const content = res.data.item?.extra?.content;
+    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;
 

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()

src/pages/search/index.vue

@@ -14,6 +14,12 @@
 <script setup>
 import searchList from './components/searchList.vue'
 import { ServeSeachQueryAll } from '@/api/search/index'
+import { onMounted } from 'vue'
+import { handleSetWebviewStyle } from '@/utils/common'
+
+onMounted(() => {
+  handleSetWebviewStyle()
+})
 
 //点击跳转到更多结果页面
 const toMoreResultPage = (searchResultKey, searchText) => {

src/pages/search/searchByCondition/index.vue

@@ -351,7 +351,7 @@ onMounted(() => {
 const ServeQueryTalkDate = (month) => {
   let params = {
     month: month,
-    talk_type: 2, //1私聊2群聊
+    talk_type: dialogueParams.talk_type, //1私聊2群聊
     receiver_id: state.receiver_id, //目标人id
   }
   const resp = ServeTalkDate(params)
@@ -477,12 +477,14 @@ const queryAllSearch = () => {
       if (data?.items?.length > 0) {
         data.items.forEach((item) => {
           item.dateTime = parseTime(item?.created_at, '{m}/{d}')
-          item.extra.fileSize = fileFormatSize(item?.extra?.size)
+          if (item?.extra) {
-          item.extra.typeText = item?.extra?.name
+            item.extra.fileSize = fileFormatSize(item?.extra?.size)
-            ? fileSuffix(item?.extra?.name)
+            item.extra.typeText = item?.extra?.name
-            : ''
+              ? fileSuffix(item?.extra?.name)
-          item.extra.file_avatar = fileTypeAvatar(item?.extra?.typeText)
+              : ''
-          console.log(item.extra.type)
+            item.extra.file_avatar = fileTypeAvatar(item?.extra?.typeText)
+            console.log(item.extra.type)
+          }
           let year = new Date(item.created_at).getFullYear()
           let month = new Date(item.created_at).getMonth() + 1
           let dateMonth =

src/store/auth/index.js

@@ -4,8 +4,8 @@ import { userInfoApi } from "@/api/user";
 
 import {ref} from 'vue'
 export const useAuth = createGlobalState(() => {
-  // const token = useStorage('token', '', uniStorage)
+  const token = useStorage('token', '', uniStorage)
-  const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8942f76b6f248056e8ae1134eda922b6ba0e5d75a00b2e866b08fec48a0d1de7e6dff8d8a40ac1eb46bf79c6331a1a3cd43209d09865bc0ee5dc9c23d2413e0d85d2380202ce4de1e128063926efae4cb1")
+  // const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b899eade812a32201a0a025612a7615c43b1ac91d78661c4e9b7d0ca9701e2ea152073ff929e2cc3f2f29c1934a8873a44886758d3cf16439dfda105c00c3c2e0d8748163a63ce7ce8e44f599b42a89d2b6")
   const refreshToken = useStorage('refreshToken', '', uniStorage)
   const userInfo = useStorage('userInfo', {}, uniStorage)
   const leaderList = useStorage('leaderList', [], uniStorage)

src/store/modules/dialogue.js

@@ -48,6 +48,9 @@ export const useDialogueStore = defineStore('dialogue', {
       // 是否显示会话列表
       isShowSessionList: true,
 
+      //是否已被解散
+      isDismiss: false,
+
       // 群成员列表
       members: [],
 
@@ -98,6 +101,8 @@ export const useDialogueStore = defineStore('dialogue', {
       this.unreadBubble = 0
       this.isShowEditor = data?.is_robot === 0
 
+      this.isDismiss = data?.is_dismiss === 1 ? true : false
+
       this.members = []
       if (data.talk_type == 2) {
         this.updateGroupMembers()

src/store/modules/dialogueList.js

@@ -7,6 +7,7 @@ import { createGlobalState, useStorage } from '@vueuse/core'
 import { uniStorage } from '@/utils/uniStorage.js'
 
 export const useDialogueListStore = createGlobalState(() => {
+  // const dialogueList = useStorage('dialogueList', [], uniStorage)
   const dialogueList = ref([])
   const zpagingRef = ref()
   const virtualList = ref([])

src/utils/common.js

@@ -64,7 +64,7 @@ export function clipboard(text, callback) {
 
 export async function clipboardImage(src, callback) {
   const { state } = await navigator.permissions.query({
-    name: 'clipboard-write'
+    name: 'clipboard-write',
   })
 
   if (state != 'granted') return
@@ -77,8 +77,8 @@ export async function clipboardImage(src, callback) {
     if (blob.type == 'image/png') {
       await navigator.clipboard.write([
         new ClipboardItem({
-          [blob.type]: blob
+          [blob.type]: blob,
-        })
+        }),
       ])
 
       return callback()
@@ -112,7 +112,7 @@ export async function clipboardImage(src, callback) {
           URL.revokeObjectURL(objectURL)
         },
         'image/png',
-        1
+        1,
       )
     }
   } catch (err) {
@@ -180,13 +180,13 @@ export function getVideoImage(file, time = 1) {
         width: video.videoWidth,
         height: video.videoHeight,
         duration: video.duration,
-        file: null
+        file: null,
       }
 
       canvas.toBlob((blob) => {
         data.file = new File([blob], 'image.jpeg', {
           type: blob.type,
-          lastModified: Date.now()
+          lastModified: Date.now(),
         })
 
         URL.revokeObjectURL(objectURL)
@@ -196,3 +196,20 @@ export function getVideoImage(file, time = 1) {
     }
   })
 }
+
+//处理webview样式
+export function handleSetWebviewStyle(hasTabBar) {
+  const setWebviewStyle = () => {
+    const webview = plus.webview.currentWebview()
+    webview.setStyle({
+      bottom: hasTabBar ? webview.tabBarHeight : 0,
+    })
+  }
+  if (typeof plus !== 'undefined') {
+    setWebviewStyle()
+  } else {
+    document.addEventListener('plusready', () => {
+      setWebviewStyle()
+    })
+  }
+}

src/utils/talk.js

@@ -38,13 +38,14 @@ export function formatTalkItem(params) {
     is_disturb: 0,
     is_top: 0,
     is_online: 0,
+    is_dismiss: 0,
     is_robot: 0,
     unread_num: 0,
     content: '......',
     draft_text: '',
     msg_text: '',
     index_name: '',
-    updated_at: parseTime(new Date())
+    updated_at: parseTime(new Date()),
   }
 
   options = { ...options, ...params }

src/utils/upload/request.js

@@ -7,7 +7,7 @@ const request = axios.create({
   baseURL: import.meta.env.VITE_BASEURL,
 
   // 请求超时时间
-  timeout: 10000
+  timeout: 60000
 })
 
 let once = false