From 656fe2e4db44d0145b49af374860580f47f51cc9 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Thu, 16 Jan 2025 18:25:21 +0800
Subject: [PATCH] =?UTF-8?q?OA=E4=BD=93=E5=88=B6=E5=86=85=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=B9=B6=E6=8E=A5=E5=85=A5=E7=9C=9F=E5=AE=9E?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=EF=BC=9B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E6=8C=89=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8E=E8=A7=86=E9=A2=91=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=BE=E7=89=87=E6=8E=92=E5=88=97=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.js                         |   9 +
 src/components/custom-btn/custom-btn.vue      |  36 ++-
 src/pages.json                                |  12 +-
 .../components/groupMembersList.vue           |   9 +
 src/pages/dialog/dialogDetail/userDetail.vue  | 287 ++++++++++++++++++
 src/pages/dialog/index.vue                    |   9 +-
 src/pages/search/components/searchItem.vue    |   3 +
 src/pages/search/searchByCondition/index.vue  | 162 +++++++++-
 src/static/image/search/result-link-icon.png  | Bin 0 -> 2132 bytes
 src/store/modules/dialogue.js                 |   6 +-
 src/uni_modules/tmui/locale/zh-Hans.json      |   9 +-
 11 files changed, 521 insertions(+), 21 deletions(-)
 create mode 100644 src/pages/dialog/dialogDetail/userDetail.vue
 create mode 100644 src/static/image/search/result-link-icon.png

diff --git a/src/api/user/index.js b/src/api/user/index.js
index a4eb9fb..9d67ccf 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -25,3 +25,12 @@ export const userLeaderApi = (data) => {
     baseURL:import.meta.env.VITE_EPR_BASEURL,
   })
 }
+
+//点击头像查看用户详情
+export const getUserInfoByClickAvatar = (data) => {
+  return request({
+    url: '/api/v1/users/info',
+    method: 'POST',
+    data,
+  })
+}
diff --git a/src/components/custom-btn/custom-btn.vue b/src/components/custom-btn/custom-btn.vue
index 2877c40..6c9c7e6 100644
--- a/src/components/custom-btn/custom-btn.vue
+++ b/src/components/custom-btn/custom-btn.vue
@@ -1,6 +1,17 @@
 <template>
-  <div class="custom-btn" :class="props.isBottom ? 'custom-btn-bottom' : ''">
-    <wd-button custom-class="custom-btn-class" @click="clickBtn">{{ props.btnText }}</wd-button>
+  <div
+    class="custom-btn"
+    :class="[
+      props.isBottom ? 'custom-btn-bottom' : '',
+      props.subBtnText ? 'apposition-btn-style' : '',
+    ]"
+  >
+    <wd-button custom-class="custom-sub-btn-class" v-if="props.subBtnText">
+      {{ props.subBtnText }}
+    </wd-button>
+    <wd-button custom-class="custom-btn-class" @click="clickBtn">
+      {{ props.btnText }}
+    </wd-button>
   </div>
 </template>
 <script setup>
@@ -11,6 +22,7 @@ const emits = defineEmits(['clickBtn'])
 const props = defineProps({
   isBottom: false, //是否底部按钮
   btnText: '', //按钮文字
+  subBtnText: '', //次要按钮文字
 })
 
 //点击
@@ -24,6 +36,16 @@ const clickBtn = () => {
   flex-direction: row;
   align-items: center;
   justify-content: center;
+  .custom-sub-btn-class {
+    background-color: #eee9f8;
+    padding: 18rpx 185rpx;
+    border-radius: 8rpx;
+    box-shadow: 0 6px 12px 2px rgba(188, 188, 188, 0.08);
+    font-size: 28rpx;
+    font-weight: 500;
+    line-height: 40rpx;
+    color: $theme-primary;
+  }
   .custom-btn-class {
     background-color: $theme-primary;
     padding: 18rpx 185rpx;
@@ -39,4 +61,14 @@ const clickBtn = () => {
   background-color: #fff;
   padding: 14rpx 0 72rpx;
 }
+.apposition-btn-style {
+  padding: 14rpx 30rpx 72rpx;
+  .custom-sub-btn-class {
+    padding: 18rpx 124rpx;
+    margin: 0 20rpx 0 0;
+  }
+  .custom-btn-class {
+    padding: 18rpx 124rpx;
+  }
+}
 </style>
diff --git a/src/pages.json b/src/pages.json
index 9853e87..5883c02 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -43,7 +43,7 @@
       "type": "page",
       "style": {
         "navigationStyle": "custom",
-        "enablePullDownRefresh":false
+        "enablePullDownRefresh": false
       }
     },
     {
@@ -51,7 +51,7 @@
       "type": "page",
       "style": {
         "navigationStyle": "custom",
-        "enablePullDownRefresh":false
+        "enablePullDownRefresh": false
       }
     },
     {
@@ -170,6 +170,14 @@
         "navigationStyle": "custom",
         "enablePullDownRefresh": false
       }
+    },
+    {
+      "path": "pages/dialog/dialogDetail/userDetail",
+      "type": "page",
+      "style": {
+        "navigationStyle": "custom",
+        "enablePullDownRefresh": false
+      }
     }
   ],
   "globalStyle": {
diff --git a/src/pages/chatSettings/components/groupMembersList.vue b/src/pages/chatSettings/components/groupMembersList.vue
index ec3f3c1..3ce0d59 100644
--- a/src/pages/chatSettings/components/groupMembersList.vue
+++ b/src/pages/chatSettings/components/groupMembersList.vue
@@ -3,6 +3,7 @@
     <div
       class="group-member-list-each"
       v-for="(memberItem, memberIndex) in props?.memberList"
+      @click="toUserDetailPage(memberItem)"
     >
       <div
         class="group-member-each"
@@ -40,6 +41,14 @@ const props = defineProps({
   memberList: Array, //人员列表
   memberListsLimit: Number, //人员列表数量限制
 })
+
+//点击跳转到用户详情页面
+const toUserDetailPage = (userItem) => {
+  console.log(userItem.erp_user_id)
+  uni.navigateTo({
+    url: '/pages/dialog/dialogDetail/userDetail?erpUserId=' + userItem.erp_user_id,
+  })
+}
 </script>
 <style scoped lang="scss">
 .group-member-list {
diff --git a/src/pages/dialog/dialogDetail/userDetail.vue b/src/pages/dialog/dialogDetail/userDetail.vue
new file mode 100644
index 0000000..d62f657
--- /dev/null
+++ b/src/pages/dialog/dialogDetail/userDetail.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="outer-layer user-detail-page">
+    <div class="root">
+      <ZPaging ref="zPaging" :show-scrollbar="false">
+        <template #top>
+          <tm-navbar
+            class="tmNavBar"
+            :hideBack="false"
+            hideHome
+            title=""
+            :leftWidth="220"
+          ></tm-navbar>
+        </template>
+        <div class="user-detail-info">
+          <div class="user-info-head user-info-card">
+            <div class="user-info-avatar">
+              <img
+                :src="state?.userInfo?.avatar"
+                v-if="state?.userInfo?.avatar"
+              />
+              <span
+                v-if="!state?.userInfo?.avatar"
+                class="text-[46rpx] font-bold"
+              >
+                {{
+                  state?.userInfo?.nickname.length >= 2
+                    ? state?.userInfo?.nickname.slice(-2)
+                    : state?.userInfo?.nickname
+                }}
+              </span>
+            </div>
+            <div class="user-info">
+              <span class="text-[40rpx] font-medium user-info-name">
+                {{ state?.userInfo?.nickname }}
+              </span>
+              <span class="text-[28rpx] font-medium user-info-job-num">
+                {{ $t('user.info.jobNum') + '：' + state?.userInfo?.job_num }}
+              </span>
+            </div>
+          </div>
+          <div class="user-info-main user-info-card">
+            <div class="user-info-main-title">
+              <img src="/src/static/image/mine/ming001@3x.png" />
+              <span class="text-[28rpx] font-medium">
+                {{ $t('index.mine.basic') }}
+              </span>
+            </div>
+            <div class="user-info-main-list">
+              <div
+                class="user-info-main-each"
+                v-for="(item, index) in state.userBasicInfos"
+                :key="index"
+              >
+                <span class="text-[28rpx] font-medium user-info-main-each-hint">
+                  {{ item.name }}
+                </span>
+                <span class="text-[28rpx] font-medium user-info-main-each-text">
+                  {{ item.value }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+        <template #bottom>
+          <customBtn
+            :isBottom="true"
+            :btnText="$t('user.detail.sendMsg')"
+            :subBtnText="$t('user.detail.ringBell')"
+          ></customBtn>
+        </template>
+      </ZPaging>
+    </div>
+  </div>
+</template>
+<script setup>
+import customBtn from '@/components/custom-btn/custom-btn.vue'
+import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { reactive } from 'vue'
+
+import { getUserInfoByClickAvatar } from '@/api/user/index'
+
+import { useI18n } from 'vue-i18n'
+const { t } = useI18n()
+
+const state = reactive({
+  erpUserId: '', //erp用户id
+  userInfo: null, //用户详情
+  userBasicInfos: [], //用户基本信息
+})
+
+onLoad((options) => {
+  console.log(options)
+  if (options.erpUserId) {
+    state.erpUserId = options.erpUserId
+    getUserInfo()
+  }
+})
+
+//获取用户信息
+const getUserInfo = () => {
+  let params = {
+    erp_user_id: Number(state.erpUserId),
+  }
+  console.log(params)
+  const resp = getUserInfoByClickAvatar(params)
+  console.log(resp)
+  resp.then(({ code, data }) => {
+    console.log(data)
+    if (code == 200) {
+      state.userInfo = data
+      let department = ''
+      let post = ''
+      if (data?.erp_dept_position?.length > 0) {
+        data.erp_dept_position.forEach((item) => {
+          if (!department) {
+            department = item.department_name
+          } else {
+            department = department + '、' + item.department_name
+          }
+          if (!post) {
+            post = item.position_name
+          } else {
+            post = post + '、' + item.position_name
+          }
+        })
+      }
+
+      let hasAddDepartment = department.split('、')
+      let uniqueArr = [...new Set(hasAddDepartment)]
+      department = uniqueArr.join('、')
+
+      let manager = ''
+      if (data?.leaders?.length > 0) {
+        data.leaders.forEach((item) => {
+          if (!manager) {
+            manager = item.user_name
+          } else {
+            manager = manager + '、' + item.user_name
+          }
+        })
+      }
+      state.userBasicInfos = [
+        {
+          name: t('index.mine.company'),
+          value: data.company_name,
+        },
+        {
+          name: t('index.mine.department'),
+          value: department,
+        },
+        {
+          name: t('index.mine.post'),
+          value: post,
+        },
+        {
+          name: t('index.mine.manager'),
+          value: manager,
+        },
+        {
+          name: t('index.mine.phone'),
+          value: data.tel_num,
+        },
+        {
+          name: t('index.mine.entry'),
+          value: data.enter_date,
+        },
+      ]
+    } else {
+    }
+  })
+
+  resp.catch(() => {})
+}
+</script>
+<style scoped lang="scss">
+.outer-layer {
+  flex: 1;
+  background-image: url('@/static/image/mine/1111.png');
+  background-size: cover;
+  background-repeat: no-repeat;
+}
+
+.tmNavBar {
+  ::v-deep .noNvueBorder {
+    border-bottom: 0 !important;
+    background-color: unset !important;
+    box-shadow: unset !important;
+  }
+}
+
+.user-detail-page {
+  .user-detail-info {
+    padding: 86rpx 32rpx 0;
+    .user-info-card {
+      background-color: #fff;
+      box-shadow: 0 6px 12px 2px rgba(188, 188, 188, 0.08);
+      border-radius: 8rpx;
+    }
+    .user-info-head {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: flex-start;
+      padding: 20rpx 32rpx;
+      .user-info-avatar {
+        width: 154rpx;
+        height: 154rpx;
+        border-radius: 16rpx;
+        overflow: hidden;
+        background: linear-gradient(to right, #674bbc, #46299d);
+        box-shadow: 0 6px 12px 2px rgba(70, 41, 157, 0.16);
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        img {
+          width: 100%;
+          height: 100%;
+        }
+        span {
+          line-height: 64rpx;
+          color: #fff;
+        }
+      }
+      .user-info {
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        justify-content: center;
+        margin: 0 0 0 32rpx;
+        .user-info-name {
+          line-height: 56rpx;
+          color: $theme-text;
+        }
+        .user-info-job-num {
+          margin: 12rpx 0 0;
+          line-height: 40rpx;
+          color: #b4b4b4;
+        }
+      }
+    }
+    .user-info-main {
+      margin: 20rpx 0 0;
+      padding: 0 18rpx;
+      .user-info-main-title {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        padding: 38rpx 12rpx 32rpx;
+        img {
+          width: 36rpx;
+          height: 40rpx;
+        }
+        span {
+          line-height: 40rpx;
+          color: $theme-text;
+          margin: 0 0 0 20rpx;
+        }
+      }
+      .user-info-main-list {
+        .user-info-main-each {
+          padding: 14rpx;
+          border-top: 1px solid $theme-border-color;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: flex-start;
+          .user-info-main-each-hint {
+            line-height: 40rpx;
+            color: $theme-text;
+            width: 112rpx;
+            white-space: nowrap;
+            flex-shrink: 0;
+          }
+          .user-info-main-each-text {
+            margin: 0 0 0 56rpx;
+            line-height: 40rpx;
+            color: #747474;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index 32feed7..48f2ef6 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -54,7 +54,7 @@
               </aside>
 
               <!-- 头像信息 -->
-              <aside class="avatar-column">
+              <aside class="avatar-column" @click="toUserDetailPage(item)">
                 <im-avatar class="pointer" :src="item.avatar" :size="80" :username="item.nickname"
                   @click="showUserInfoModal(item.user_id)" />
               </aside>
@@ -693,6 +693,13 @@ const toChatSettingsPage = () => {
   })
 }
 
+//点击跳转到用户详情页面
+const toUserDetailPage = (userItem) => {
+  uni.navigateTo({
+    url: '/pages/dialog/dialogDetail/userDetail?erpUserId=' + userItem.erp_user_id,
+  })
+}
+
 onMounted(async () => {
   initData()
 })
diff --git a/src/pages/search/components/searchItem.vue b/src/pages/search/components/searchItem.vue
index fc857f5..eb1bc72 100644
--- a/src/pages/search/components/searchItem.vue
+++ b/src/pages/search/components/searchItem.vue
@@ -287,6 +287,9 @@ const resultDetail = computed(() => {
     width: 64rpx;
     height: 64rpx;
     margin: 0 18rpx 0 0;
+    span {
+      font-size: 20rpx;
+    }
   }
   .result-info {
     width: 100%;
diff --git a/src/pages/search/searchByCondition/index.vue b/src/pages/search/searchByCondition/index.vue
index e46adab..7de53e2 100644
--- a/src/pages/search/searchByCondition/index.vue
+++ b/src/pages/search/searchByCondition/index.vue
@@ -67,9 +67,19 @@
         </div>
         <div
           class="search-by-condition-input-list"
-          v-if="state.condition === 'file' || state.condition === 'link'"
+          v-if="
+            state.condition === 'imgAndVideo' ||
+            state.condition === 'file' ||
+            state.condition === 'link'
+          "
+          :style="{
+            padding: state.condition === 'imgAndVideo' ? '0 27rpx' : '',
+          }"
         >
-          <div class="search-by-condition-input">
+          <div
+            class="search-by-condition-input"
+            v-if="state.condition === 'file' || state.condition === 'link'"
+          >
             <customInput
               :searchText="state.searchText"
               :first_talk_record_infos="state.first_talk_record_infos"
@@ -95,13 +105,68 @@
                     {{ conditionItem.dateMonth }}
                   </span>
                 </div>
-                <div class="condition-each-resultList">
+                <div
+                  class="condition-each-resultList"
+                  :class="[
+                    state.condition === 'imgAndVideo'
+                      ? 'condition-type-imgAndVideo-result'
+                      : '',
+                  ]"
+                >
                   <div
                     class="condition-each-resultList-each"
                     v-for="(item, index) in conditionItem.monthResultList"
                     :key="index"
+                    :style="{
+                      border: state.condition === 'imgAndVideo' ? '0' : '',
+                      padding:
+                        state.condition === 'imgAndVideo' ? '0 0 10rpx' : '',
+                    }"
                   >
-                    <div class="condition-each-result-main">
+                    <div
+                      class="condition-result-imgAndVideo"
+                      v-if="state.condition === 'imgAndVideo'"
+                    >
+                      <div
+                        class="condition-result-imgAndVideo-area"
+                        v-if="item?.extra?.items?.length > 0"
+                      >
+                        <div
+                          class="condition-result-imgAndVideo-each"
+                          v-for="(imgItem, imgIndex) in item?.extra?.items"
+                          :key="imgIndex"
+                        >
+                          <tm-image
+                            preview
+                            :src="imgItem?.content"
+                            v-if="imgItem?.type == 3"
+                            model="aspectFill"
+                          />
+                        </div>
+                      </div>
+                      <div
+                        class="condition-result-imgAndVideo-area"
+                        v-if="item?.extra?.url"
+                      >
+                        <tm-image
+                          preview
+                          :src="
+                            item?.msg_type === 3
+                              ? item?.extra?.url
+                              : item?.msg_type === 5
+                              ? item?.extra?.cover
+                              : ''
+                          "
+                          model="aspectFill"
+                        />
+                      </div>
+                    </div>
+                    <div
+                      class="condition-each-result-main"
+                      v-if="
+                        state.condition === 'file' || state.condition === 'link'
+                      "
+                    >
                       <searchItem
                         :searchItem="item"
                         :conditionType="state.msg_type"
@@ -112,26 +177,63 @@
                         {{ item.dateTime }}
                       </span>
                     </div>
-                    <div class="condition-each-result-attachments">
+                    <div
+                      class="condition-each-result-attachments"
+                      v-if="
+                        state.condition === 'file' || state.condition === 'link'
+                      "
+                    >
                       <div class="attachment-avatar">
-                        <img :src="item?.extra?.file_avatar" />
+                        <img
+                          :src="item?.extra?.file_avatar"
+                          v-if="state.condition === 'file'"
+                        />
+                        <img
+                          src="/src/static/image/search/result-link-icon.png"
+                          v-if="state.condition === 'link'"
+                        />
                       </div>
                       <div class="attachment-info">
                         <div class="attachment-info-title">
-                          <span class="text-[28rpx] font-regular">
+                          <span
+                            class="text-[28rpx] font-regular"
+                            v-if="state.condition === 'file'"
+                          >
                             {{ item?.extra?.name }}
                           </span>
+                          <span
+                            class="text-[28rpx] font-regular"
+                            v-if="state.condition === 'link'"
+                          >
+                            {{ $t('record.share.link') }}
+                          </span>
                         </div>
-                        <div class="attachment-sub-info">
-                          <span class="text-[24rpx] font-regular">
+                        <div
+                          class="attachment-sub-info"
+                          :style="{
+                            margin:
+                              state.condition === 'file' ? '20rpx 0 0' : '',
+                          }"
+                        >
+                          <span
+                            class="text-[24rpx] font-regular"
+                            v-if="state.condition === 'file'"
+                          >
                             {{ item?.extra?.typeText }}
                           </span>
                           <span
                             class="text-[24rpx] font-regular"
+                            v-if="state.condition === 'file'"
                             style="margin: 0 0 0 20rpx;"
                           >
                             {{ item?.extra?.fileSize }}
                           </span>
+                          <span
+                            class="text-[24rpx] font-regular"
+                            v-if="state.condition === 'link'"
+                          >
+                            {{ item?.extra?.content }}
+                          </span>
                         </div>
                       </div>
                     </div>
@@ -206,6 +308,11 @@ onLoad((options) => {
       state.showPageTitle = true
       state.pageTitle = t('search.condition.date')
       ServeQueryTalkDate(parseTime(state.nowDate, '{y}{m}'))
+    } else if (options.condition === 'imgAndVideo') {
+      state.showPageTitle = true
+      state.pageTitle = t('record.searchType.imgWithVideo')
+      state.msg_type = '3,5'
+      queryAllSearch()
     } else if (options.condition === 'file') {
       console.log(dialogueParams)
       let first_talk_record_infos = {
@@ -228,7 +335,7 @@ onLoad((options) => {
         state.first_talk_record_infos,
         first_talk_record_infos,
       )
-      state.msg_type = 0
+      state.msg_type = 14
       queryAllSearch()
     }
   }
@@ -554,16 +661,49 @@ body::v-deep .round-3 {
                   flex-direction: row;
                   align-items: center;
                   justify-content: flex-start;
-                  margin: 20rpx 0 0;
                   span {
                     line-height: 34rpx;
                     color: $theme-hint-text;
+                    word-break: break-all;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
                   }
                 }
               }
             }
           }
         }
+        .condition-type-imgAndVideo-result {
+          border-bottom: 0;
+          padding: 0;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          justify-content: flex-start;
+          flex-wrap: wrap;
+          .condition-each-resultList-each {
+            .condition-result-imgAndVideo {
+              margin: 0 5rpx;
+              ::v-deep .overflow {
+                width: 164rpx !important;
+                height: 164rpx !important;
+              }
+              .condition-result-imgAndVideo-area {
+                ::v-deep .overflow {
+                  width: 164rpx !important;
+                  height: 164rpx !important;
+                }
+                ::v-deep .round-0 {
+                  width: 164rpx !important;
+                  height: 164rpx !important;
+                }
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/src/static/image/search/result-link-icon.png b/src/static/image/search/result-link-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..33b1308da2fec1848b494d7796031fcde74385e1
GIT binary patch
literal 2132
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
RO+TAvz!qX})okgP@?SOR3cUaT

literal 0
HcmV?d00001

diff --git a/src/store/modules/dialogue.js b/src/store/modules/dialogue.js
index 1b60160..53fbcb2 100644
--- a/src/store/modules/dialogue.js
+++ b/src/store/modules/dialogue.js
@@ -73,8 +73,7 @@ export const useDialogueStore = defineStore('dialogue', {
     getSilenceMember: (state) =>
       state.members.filter((item) => item.is_mute === 1),
     //获取群管理员
-    getAdminList: (state) =>
-      state.members.filter((item) => item.leader === 1),
+    getAdminList: (state) => state.members.filter((item) => item.leader === 1),
   },
   actions: {
     // 更新在线状态
@@ -119,7 +118,8 @@ export const useDialogueStore = defineStore('dialogue', {
         remark: o.remark,
         online: false,
         value: o.nickname,
-        key: o.key
+        key: o.key,
+        erp_user_id: o.erp_user_id,
       }))
     },
 
diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json
index 0edff99..be6b943 100644
--- a/src/uni_modules/tmui/locale/zh-Hans.json
+++ b/src/uni_modules/tmui/locale/zh-Hans.json
@@ -60,7 +60,7 @@
   "index.mine.post": "岗位",
   "index.mine.manager": "主管",
   "index.mine.phone": "手机号",
-  "index.mine.entry": "入职时间",
+  "index.mine.entry": "入职日期",
   "index.mine.unable": "无法上传照片",
   "index.mine.face": "扫脸失败",
   "index.mine.recentPhoto": "个人近照",
@@ -96,6 +96,7 @@
   "search.chat.record": "搜索聊天记录",
   "record.searchType.date": "日期",
   "record.searchType.imgAndVideo": "图片及视频",
+  "record.searchType.imgWithVideo": "图片与视频",
   "record.searchType.files": "文件",
   "record.searchType.link": "链接",
   "group.identify.admin": "管理员",
@@ -117,5 +118,9 @@
   "silence.tag.hasDone": "已禁言",
   "chat.manage.addAdmin": "添加管理员",
   "search.condition.member": "按群成员查找",
-  "result.date.nowMonth": "这个月"
+  "result.date.nowMonth": "这个月",
+  "user.detail.ringBell": "打电话",
+  "user.detail.sendMsg": "发消息",
+  "user.info.jobNum": "工号",
+  "record.share.link": "分享链接"
 }