17 changed files with 72 additions and 159 deletions
--- a/components.d.ts
+++ b/components.d.ts
@ -30,8 +30,6 @@ 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']
--- 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
 }
--- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@ -684,8 +684,6 @@ 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 {
--- a/src/pages/chatSettings/index.vue
+++ b/src/pages/chatSettings/index.vue
@ -262,9 +262,7 @@ onLoad(async (options) => {
    console.log(options.groupId)
    state.groupId = Number(options.groupId)
    await groupStore.ServeGroupDetail()
-    if (dialogueParams.type === 2) {
-      await groupStore.ServeGetGroupNotices()
-    }
+    await groupStore.ServeGetGroupNotices()
  }
  if (options.sessionId) {
    state.sessionId = Number(options.sessionId)
--- a/src/pages/chooseByDeps/index.vue
+++ b/src/pages/chooseByDeps/index.vue
@ -2,11 +2,8 @@
  <div class="choose-deps-page">
    <zPaging ref="zPaging" :show-scrollbar="false">
      <template #top>
-        <div :class="state.chooseMode === 3 ? 'top_bg' : ''">
-          <customNavbar
-            :class="state.chooseMode === 3 ? 'index_top_navbar' : ''"
-            :title="pageTitle"
-          ></customNavbar>
+        <div :class="state.chooseMode === 3 ? 'top_bg': ''">
+          <customNavbar :class="state.chooseMode === 3 ? 'index_top_navbar': ''" :title="pageTitle"></customNavbar>
          <div class="pl-[32rpx] pr-[32rpx] pt-[32rpx] pb-[32rpx]">
            <customInput
              :searchText="searchVal"
@ -17,33 +14,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-for="(item, index) in crumbs"
-              class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
-              :class="[
-                index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
-                index === 0 ? '' : 'ml-[12rpx]',
-              ]"
-              @click="handleCrumbsClick(index)"
+              v-if="crumbs.length"
+              class="w-full overflow-x-auto mt-[22rpx] leading-[48rpx] text-[#2F2F2F] flex items-center no-scrollbar"
+              ref="crumbsContainer"
            >
-              <div>{{ item.name }}</div>
              <div
-                v-if="index !== crumbs.length - 1"
-                class="ml-[20rpx] flex items-center mb-[2rpx]"
+                v-for="(item, index) in crumbs"
+                class="flex items-center text-[28rpx] leading-[48rpx] whitespace-nowrap"
+                :class="[
+                  index === crumbsIndex ? 'text-[#747474]' : 'text-[#46299D]',
+                  index === 0 ? '' : 'ml-[12rpx]',
+                ]"
+                @click="handleCrumbsClick(index)"
              >
-                <tm-icon
-                  name="tmicon-angle-right"
-                  :font-size="20"
-                  :color="index !== crumbs.length - 1 ? '#7A58DE' : '#C1B4EA'"
-                ></tm-icon>
+                <div>{{ item.name }}</div>
+                <div
+                  v-if="index !== crumbs.length - 1"
+                  class="ml-[20rpx] flex items-center mb-[2rpx]"
+                >
+                  <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) &&
@ -463,7 +460,6 @@ 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()
@ -994,7 +990,6 @@ const checkCurrentItem = (item) => {
 }

 onMounted(() => {
-  handleSetWebviewStyle()
  init()
 })

@ -1111,18 +1106,18 @@ const toUserDetail = (userItem) => {
  height: 100%;
  display: flex;
 }
-::v-deep .index_top_navbar .tmicon-angle-left {
-  color: #fff !important;
+::v-deep .index_top_navbar .tmicon-angle-left{
+  color:#fff !important;
 }
-::v-deep .index_top_navbar .text-weight-b {
-  color: #fff !important;
+::v-deep .index_top_navbar .text-weight-b{
+  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;
--- a/src/pages/creatGroupChat/index.vue
+++ b/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, onMounted } from 'vue'
+import { ref, watch, computed } from 'vue'
 import { onShow, onLoad } from '@dcloudio/uni-app'
 import { useChatList } from '@/store/chatList/index.js'
 import { useAuth } from '@/store/auth'
@ -195,7 +195,6 @@ 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,
@ -218,10 +217,6 @@ onLoad(()=> {
  groupStore.$reset()
 })

-onMounted(() => {
-  handleSetWebviewStyle()
-})
-
 //群类型
 const groupType = computed(() => {
  let group_type = ''
--- a/src/pages/dialog/dialogDetail/userDetail.vue
+++ b/src/pages/dialog/dialogDetail/userDetail.vue
@ -115,7 +115,7 @@ const state = reactive({
  erpUserId: '', //erp用户id
  userInfo: null, //用户详情
  userBasicInfos: [], //用户基本信息
-  isShowPhoneCall: false, //是否显示电话拨号弹框
+  isShowPhoneCall: true, //是否显示电话拨号弹框
  phoneNumber: '', //手机号
 })

--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@ -24,10 +24,7 @@
            <div class="text-[24rpx] text-[#999999]">公司群</div>
          </template>
          <template #right>
-            <div
-              class="mr-[36rpx] toChatSetting_btn"
-              v-if="!talkParams.isDismiss"
-            >
+            <div class="mr-[36rpx] toChatSetting_btn">
              <tm-icon
                color="rgb(51, 51, 51)"
                :font-size="36"
@ -73,18 +70,9 @@
              :datetime="item.created_at"
              :msg_id="item.msg_id"
            >
-              <template
-                v-if="
-                  canEditRevokedMessage(item) && item.user_id === userStore.uid
-                "
-              >
-                <span
-                  class="edit-revoked-message"
-                  @click="restoreRevokedMessage(item)"
-                >
-                  重新编辑
-                </span>
-              </template>
+            <template v-if="canEditRevokedMessage(item) && item.user_id === userStore.uid">
+              <span class="edit-revoked-message" @click="restoreRevokedMessage(item)">重新编辑</span>
+            </template>
            </revoke-message>
          </div>

@ -145,7 +133,7 @@
                <deepBubble
                  @clickMenu="(menuType) => onContextMenu(menuType, item)"
                  :isShowCopy="isShowCopy(item)"
-                  :isShowWithdraw="isRevoke(talkParams.uid, item) || isLeader"
+                  :isShowWithdraw="isRevoke(talkParams.uid, item)"
                >
                  <component
                    class="component-content"
@ -491,7 +479,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'
@ -534,8 +522,6 @@ 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({
@ -782,8 +768,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]
    }
  })
@ -946,26 +932,27 @@ 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)
    // 将光标设置到文本末尾
@ -983,6 +970,7 @@ const restoreRevokedMessage = async (item) => {
  // 可以根据需要添加其他类型消息的处理
 }

+
 const actionDelete = (item) => {
  console.log('删除')
  item.isCheck = true
@ -1302,32 +1290,7 @@ 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,
@ -1377,7 +1340,7 @@ onUnmounted(() => {

 .edit-revoked-message {
  margin-left: 10rpx;
-  color: #46299d;
+  color: #46299D;
  cursor: pointer;
  font-size: 24rpx;

--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@ -131,7 +131,6 @@ 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()
@ -215,7 +214,6 @@ const toAddressBookPage = () => {
 ); */

 onShow(() => {
-  handleSetWebviewStyle(true)
  // 页面显示时重新加载数据
  talkStore
    .loadTalkList()
--- a/src/pages/search/index.vue
+++ b/src/pages/search/index.vue
@ -14,12 +14,6 @@
 <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) => {
--- a/src/pages/search/searchByCondition/index.vue
+++ b/src/pages/search/searchByCondition/index.vue
@ -351,7 +351,7 @@ onMounted(() => {
 const ServeQueryTalkDate = (month) => {
  let params = {
    month: month,
-    talk_type: dialogueParams.talk_type, //1私聊2群聊
+    talk_type: 2, //1私聊2群聊
    receiver_id: state.receiver_id, //目标人id
  }
  const resp = ServeTalkDate(params)
@ -477,14 +477,12 @@ const queryAllSearch = () => {
      if (data?.items?.length > 0) {
        data.items.forEach((item) => {
          item.dateTime = parseTime(item?.created_at, '{m}/{d}')
-          if (item?.extra) {
-            item.extra.fileSize = fileFormatSize(item?.extra?.size)
-            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.fileSize = fileFormatSize(item?.extra?.size)
+          item.extra.typeText = item?.extra?.name
+            ? fileSuffix(item?.extra?.name)
+            : ''
+          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 =
--- a/src/store/auth/index.js
+++ b/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 = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b899eade812a32201a0a025612a7615c43b1ac91d78661c4e9b7d0ca9701e2ea152073ff929e2cc3f2f29c1934a8873a44886758d3cf16439dfda105c00c3c2e0d8748163a63ce7ce8e44f599b42a89d2b6")
+  // const token = useStorage('token', '', uniStorage)
+  const token = ref("79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b8942f76b6f248056e8ae1134eda922b6ba0e5d75a00b2e866b08fec48a0d1de7e6dff8d8a40ac1eb46bf79c6331a1a3cd43209d09865bc0ee5dc9c23d2413e0d85d2380202ce4de1e128063926efae4cb1")
  const refreshToken = useStorage('refreshToken', '', uniStorage)
  const userInfo = useStorage('userInfo', {}, uniStorage)
  const leaderList = useStorage('leaderList', [], uniStorage)
--- a/src/store/modules/dialogue.js
+++ b/src/store/modules/dialogue.js
@ -48,9 +48,6 @@ export const useDialogueStore = defineStore('dialogue', {
      // 是否显示会话列表
      isShowSessionList: true,

-      //是否已被解散
-      isDismiss: false,
-
      // 群成员列表
      members: [],

@ -101,8 +98,6 @@ 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()
--- a/src/store/modules/dialogueList.js
+++ b/src/store/modules/dialogueList.js
@ -7,7 +7,6 @@ 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([])
--- a/src/utils/common.js
+++ b/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,20 +196,3 @@ 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()
-    })
-  }
-}
--- a/src/utils/talk.js
+++ b/src/utils/talk.js
@ -38,14 +38,13 @@ 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 }
--- a/src/utils/upload/request.js
+++ b/src/utils/upload/request.js
@ -7,7 +7,7 @@ const request = axios.create({
  baseURL: import.meta.env.VITE_BASEURL,

  // 请求超时时间
-  timeout: 60000
+  timeout: 10000
 })

 let once = false