Merge branch 'wyfMain-dev'

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

src/components/talk/message/FileMessage.vue

@@ -68,7 +68,7 @@ const getFileTypeIMG = computed(() => {
     :class="{ left: data.float === 'left', right: data.float === 'right' }"
   >
     <div class="flex justify-between">
-      <div class="w-[228rpx] text-[32rpx] text-[#1A1A1A] h-[88rpx] leading-[44rpx] textEllipsis">
+      <div class="w-[228rpx] text-[32rpx] text-[#1A1A1A] h-[88rpx] leading-[44rpx] textEllipsis file_name">
         {{ extra.name }}
       </div>
       <div v-if="data.uploadStatus === 2 || !data.uploadStatus" class="w-[95rpx]">
@@ -124,6 +124,11 @@ const getFileTypeIMG = computed(() => {
     border-radius: 16rpx 0 16rpx 16rpx;
   }
 
+  .file_name{
+    word-break: break-all; /* 在任意字符间断行 */
+    word-wrap: break-word; /* 允许长单词换行到下一行 */
+  }
+  
   .main {
     height: 45px;
     display: flex;

src/pages/chooseByDeps/index.vue

@@ -2,8 +2,8 @@
   <div class="choose-deps-page">
     <zPaging ref="zPaging" :show-scrollbar="false">
       <template #top>
-        <div class="top_bg">
-          <customNavbar class="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"

src/pages/creatGroupChat/index.vue

@@ -323,6 +323,9 @@ const confirmBtnStatus = computed(() => {
   }
   switch (groupActiveIndex.value) {
     case 0:
+      if(allChooseMembers?.value?.length < 3) {
+        disabledT = true
+      }
       break
     case 1:
       if (!depCheckedKeys.value.length) {
@@ -333,6 +336,9 @@ const confirmBtnStatus = computed(() => {
       }
       break
     case 2:
+      if(allChooseMembers?.value?.length < 3) {
+        disabledT = true
+      }
       break
     default:
       break

src/store/auth/index.js

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