bug fix

src/api/api-types/message.d.ts

@@ -13,6 +13,7 @@ export namespace Message {
     sendUserName: string
     unReadCount: number
     sendUserRole?: any
+    receiveUserRole?: any
   }
   /** 历史消息 */
   type GetMessageHistory = BaseDefine<{ sendUserId: number }, BaseMessageResponse[]>

src/components/shared/message/MessageList.vue

@@ -177,11 +177,17 @@ const showHistory = ref<boolean>(false)
 const { fetch: getMessageList, result: messageList } = useFetch('getMessageList')
 
 const currentMessage = ref<MessageType>()
-const isFromOther = computed(() => {
-  return mainStore?.myUserInfo?.id != currentMessage.value?.sendUserId
+// const isFromOther = computed(() => {
+//   return mainStore?.myUserInfo?.id != currentMessage.value?.sendUserId
+// })
+const getOtherRole = computed(() => {
+  return mainStore?.myUserInfo?.id == currentMessage.value?.sendUserId
+    ? currentMessage.value?.receiveUserRole
+    : currentMessage.value?.sendUserRole
 })
 const isFromMyLeader = computed(() => {
-  return isFromOther.value && currentMessage.value?.sendUserRole === 'DEPUTY'
+  // return isFromOther.value && currentMessage.value?.sendUserRole === 'DEPUTY'
+  return mainStore?.myUserInfo?.role !== 'MARKER' || getOtherRole.value === 'DEPUTY'
 })
 function scrollToBottom() {
   let scrollHeight = historyMsgWrap.value.scrollHeight

src/modules/admin-user/manage/index.vue

@@ -124,7 +124,13 @@
             </el-popconfirm>
           </template>
         </base-table>
-        <el-pagination v-bind="pagination" v-model:current-page="currentPage" background right></el-pagination>
+        <el-pagination
+          v-bind="pagination"
+          v-model:current-page="currentPage"
+          background
+          right
+          layout="total,pager"
+        ></el-pagination>
       </el-card>
     </div>
     <base-dialog :width="380" title="导入/导出" destroy-on-close>