Merge branch 'wyfMain-dev'

src/api/user/index.js

@@ -10,10 +10,9 @@ export const ServeGetUserSetting = (data) => {
 
 export const userInfoApi = (data) => {
   return request({
-    url: '/user/info',
+    url: '/api/v1/users/erp/info',
     method: 'POST',
     data,
-    baseURL:import.meta.env.VITE_EPR_BASEURL,
   })
 }
 

src/event/talk.js

@@ -141,7 +141,11 @@ class Talk extends Base {
       this.updateTalkItem()
       if (
         !useTalkStore().items[useTalkStore().findTalkIndex(this.getIndexName())]
-          ?.is_disturb
+          ?.is_disturb &&
+        !(
+          useTalkStore().findTalkIndex(this.getIndexName()) == -1 &&
+          (this.resource.msg_type == 1104 || this.resource.msg_type == 1115)
+        )
       ) {
         this.updateUnreadMsgNumAdd()
       }

src/pages/dialog/components/filePanel.vue

@@ -106,8 +106,10 @@ const photoActionsSelect = (index) => {
               plus.nativeUI.toast('图片大小不能超过100MB')
               return
             }
-            let data = await onUploadImageVideo(file, 'image')
+            const result = await onUploadImageVideo(file, 'image')
-            emit('selectImg', data, data.file_num)
+            if (result) {
+              emit('selectImg', result, result.file_num)
+            }
           })
         },
       })
@@ -134,7 +136,9 @@ const photoActionsSelect = (index) => {
                       return
                     }
                     let data = await onUploadImageVideo(fileObj, 'image')
-                    emit('selectImg', data, data.file_num)
+                    if (data) {
+                      emit('selectImg', data, data.file_num)
+                    }
                   }
                 })
               },
@@ -174,7 +178,9 @@ const photoActionsSelect = (index) => {
           'video',
           res.tempFilePath,
         )
-        emit('selectImg', data, data.file_num)
+        if (data) {
+          emit('selectImg', data, data.file_num)
+        }
       },
     })
   }

src/pages/dialog/index.vue

@@ -950,7 +950,15 @@ const editorOption = {
 }
 
 const handleSelectImg = (data, file_num) => {
-  onSendMessage({ ...data, file_num })
+  if (Array.isArray(data)) {
+    // 批量发送图片
+    data.forEach(item => {
+      onSendMessage({ ...item, file_num: item.file_num })
+    })
+  } else {
+    // 单张图片发送
+    onSendMessage({ ...data, file_num })
+  }
 }
 
 const virtualListChange = (vList) => {

src/service/index.js

@@ -44,7 +44,8 @@ const request = new Request({
         messageInstance.warning(res.data.msg)
       }
       if (res.data.status === 401) {
-        return getRefreshToken(res);
+        return
+        // return getRefreshToken(res);
         // uni.navigateTo({
         //   url:'/pages/login/index'
         // })
@@ -85,9 +86,9 @@ async function getRefreshToken(response) {
           throw new Error(res.message || res.msg);
         }
       } catch (error) {
-        uni.navigateTo({
+        // uni.navigateTo({
-          url:'/pages/login/index'
+        //   url:'/pages/login/index'
-        })
+        // })
         throw error
       } finally {
         isRefreshing = false;
@@ -95,9 +96,9 @@ async function getRefreshToken(response) {
         refreshSubscribers = [];
       }
     } else {
-      uni.navigateTo({
+      // uni.navigateTo({
-        url:'/pages/login/index'
+      //   url:'/pages/login/index'
-      })
+      // })
       throw new Error('No refresh token available.');
     }
   } else {