From f2abedd88eb46ddbf171d367718541d2b2408ffe Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Tue, 11 Mar 2025 13:58:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8C=81=E4=B9=85=E5=8C=96=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E8=81=8A=E5=A4=A9=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/dialogueList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/dialogueList.js b/src/store/modules/dialogueList.js
index a9a8c84..adda583 100644
--- a/src/store/modules/dialogueList.js
+++ b/src/store/modules/dialogueList.js
@@ -7,7 +7,7 @@ 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([])
 

From ae2a447fa4ef186781b55fb1f05a04edd3a67d8f Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Tue, 11 Mar 2025 19:56:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9=E6=8F=90=E9=86=92=E7=9A=84?=
 =?UTF-8?q?=E4=BA=BA=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/dialog/index.vue                    | 156 +++++++++++++++++-
 .../image/chatList/mention_select_hide_bg.png | Bin 0 -> 752 bytes
 .../chatList/mention_select_hide_icon.png     | Bin 0 -> 208 bytes
 src/uni_modules/tmui/locale/zh-Hans.json      |   2 +-
 4 files changed, 152 insertions(+), 6 deletions(-)
 create mode 100644 src/static/image/chatList/mention_select_hide_bg.png
 create mode 100644 src/static/image/chatList/mention_select_hide_icon.png

diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index aebfa4a..23f340e 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -212,15 +212,13 @@
                     }}
                   </span>
                   <span
-                    v-if="state?.quoteInfo?.msg_type === 3"
+                    v-if="state?.quoteInfo"
                     class="text-[28rpx] text-[#999]"
                   >
                     {{
                       state?.quoteInfo?.nickname +
                       '：' +
-                      '[' +
-                      $t('msg.type') +
-                      ']'
+                      ChatMsgTypeMapping[state?.quoteInfo?.msg_type]
                     }}
                   </span>
                   <img
@@ -344,6 +342,70 @@
         </div>
       </template>
     </ZPaging>
+    <tm-drawer placement="bottom" :show="true" :hideHeader="true" :round="5">
+      <div
+        class="mention-select-drawer flex flex-row flex-1 flex-row flex-row-center-between"
+      >
+        <div
+          class="cancel-btns flex-row flex flex-row-center-start"
+          style="width: 210rpx;"
+        >
+          <div class="hide-btn" v-if="!state.mentionIsMulSelect">
+            <img
+              style="width: 40rpx; height: 40rpx;"
+              src="/src/static/image/chatList/mention_select_hide_bg.png"
+            />
+            <img
+              style="
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                margin-left: -9rpx;
+                margin-top: -5rpx;
+              "
+              src="/src/static/image/chatList/mention_select_hide_icon.png"
+            />
+          </div>
+          <span
+            style="flex-shrink: 0; display: block;"
+            class="text-[32rpx] font-regular text-[#191919]"
+            v-if="state.mentionIsMulSelect"
+            @click="changeMentionSelectMul(false)"
+          >
+            {{ $t('cancel') }}
+          </span>
+        </div>
+        <div
+          class="flex flex-row-center-center flex-col"
+          style="padding: 6rpx 0;"
+        >
+          <text>{{ $t('chat.mention.select') }}</text>
+        </div>
+        <div class="flex-row flex flex-row-center-end" style="width: 210rpx;">
+          <div
+            class="mention-edit-btn"
+            v-if="!state.mentionIsMulSelect"
+            @click="changeMentionSelectMul(true)"
+          >
+            <span class="text-[32rpx] font-regular text-[#191919]">
+              {{ $t('button.multiple.choice') }}
+            </span>
+          </div>
+          <div
+            class="mention-done-btn"
+            :class="
+              state?.mentionSelectComplete ? 'mention-done-btn-can-do' : ''
+            "
+            v-if="state.mentionIsMulSelect"
+            @click="changeToSelectMode"
+          >
+            <span class="text-[32rpx] font-regular text-[#191919]">
+              {{ $t('button.text.done') }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </tm-drawer>
   </div>
 </template>
 <script setup>
@@ -370,7 +432,11 @@ import {
   useDialogueListStore,
 } from '@/store'
 import addCircleGray from '@/static/image/chatList/addCircleGray.png'
-import { MessageComponents, ForwardableMessageType } from '@/constant/message'
+import {
+  MessageComponents,
+  ForwardableMessageType,
+  ChatMsgTypeMapping,
+} from '@/constant/message'
 import { formatTime, parseTime } from '@/utils/datetime'
 import { deltaToMessage, deltaToString, isEmptyDelta } from './util'
 import smile from '@/static/image/chatList/smile@2x.png'
@@ -433,6 +499,7 @@ const state = ref({
   sessionId: '',
   localPageLoadDone: true, //分页加载缓存中的聊天记录是否完毕
   quoteInfo: null, //引用信息
+  mentionIsMulSelect: false, //是否是多选提醒的人
 })
 
 uniOnload((options) => {
@@ -487,6 +554,15 @@ const onSendMessage = (data = {}, callBack) => {
 
 const onSendMessageClick = () => {
   let delta = getQuill().getContents()
+  if (state.value.quoteInfo) {
+    delta.ops.unshift({
+      insert: {
+        quote: {
+          id: state.value.quoteInfo.msg_id,
+        },
+      },
+    })
+  }
   let data = deltaToMessage(delta)
 
   if (data.items.length === 0) {
@@ -503,6 +579,9 @@ const onSendMessageClick = () => {
         callBack: (ok) => {
           if (!ok) return
           getQuill().setContents([], Quill.sources.USER)
+          if (state.value.quoteInfo) {
+            state.value.quoteInfo = null
+          }
         },
       })
       break
@@ -934,6 +1013,11 @@ const toUserDetailPage = (userItem) => {
   })
 }
 
+//切换提醒的人选择弹窗多选状态
+const changeMentionSelectMul = (status) => {
+  state.value.mentionIsMulSelect = status
+}
+
 onMounted(async () => {
   initData()
 })
@@ -1256,4 +1340,66 @@ onUnmounted(() => {
   height: 1rpx;
   background-color: #e7e7e7;
 }
+
+.mention-select-drawer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 36rpx 32rpx;
+  .cancel-btns {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    .hide-btn {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      text {
+      }
+      img {
+        width: 18rpx;
+        height: 10rpx;
+      }
+    }
+  }
+
+  .mention-done-btn {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+    padding: 6rpx 24rpx;
+    background-color: #f3f3f3;
+    border-radius: 8rpx;
+    flex-shrink: 0;
+    span {
+      color: #bababa;
+      line-height: 40rpx;
+      flex-shrink: 0;
+    }
+  }
+
+  .mention-done-btn-can-do {
+    background-color: #46299d;
+    span {
+      color: #fff;
+    }
+  }
+
+  .mention-edit-btn {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end;
+    flex-shrink: 0;
+    span {
+      flex-shrink: 0;
+    }
+  }
+}
 </style>
diff --git a/src/static/image/chatList/mention_select_hide_bg.png b/src/static/image/chatList/mention_select_hide_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ab3f138a2702d37d6f882523465493850fd8912
GIT binary patch
literal 752
zcmeAS@N?(olHy`uVBq!ia0vp^Iv~u!3?wz9Rv7~+#^NA%Cx&(BWL^T<A^|=ju0X;6
zNZ`zwGhe=ZdHeS5`}gmE{P^+d(<dPJ!-o%_!2rSlia-QEe*6ezeEs?r$N;JYGJqrm
z0F?t7KoYDLL_oxWY9K~I6u`xSvOqRm7hDZo1fm^oCPW<01z7+FST!OGVl@zA4qRDA
zSb-lfT%t>Y{DK)6nV4BvC1e!TH4Ka#9G#q;UEDl8yu5vV{R0Ank}?WPO3N#2>zkU}
z+dI2^dZsT}x@`H%4I4LZ-L`%A?t{mUA3t&O)Y%Icuid<R_x{soFJHfX_wM}%V7Pt#
z`|s0Ji%-C4Q1*0j43UuRJ;)i($SA>jAzb-Z$QBLNwOUsexN5mdFPxGz<NN>r?%N*o
zY_9#DbjU}cGI&MCE%%33k{=E<3Z49OalynsjSXh9YcDO4n%ma;Q#?xR+(DI97u&XV
zbBdP~v>84xnbLAlG4@Te%AJMX=d9Y&>R+yUci5qisr<$51t+Ac=4pKDSQpB*mLWiM
z2~)5s*VP8sE?ot;jS`zgPCuHN#2TU*<~Tbk*F^K0%gm(ICz{iaiyqaRxFABNuIuN*
zn!p#qj3Hbr8K!AIalfwZ+V$e*5)Y1AORhUf2fjOpm&&(oE8TTryFrnUxVu5e<v^xn
zzLHy)z8ffh@s<86;Il_^uGp6z@vx?RlS=+W=lpg#HoIBzsLwl)`D)*ltf_KA>fUla
azu6_6#J4pqYQ6-F6$VdNKbLh*2~7YRJ<!hp

literal 0
HcmV?d00001

diff --git a/src/static/image/chatList/mention_select_hide_icon.png b/src/static/image/chatList/mention_select_hide_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62b5f76eb3be1ad5ebec06c20aa7ff05c8dfe210
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&T!VDxEEDx9iDaPU;cPEB*=VV?2If?;3A+A8$
z!NH-pxVW^m6iAl90Gw^NOm8Dl5m!l&UoZoUO>jtg|MJhj{doT=07czBT^vI=t|tqa
zConK>V`y7-G9m0*5Zn2w3Xa=CeR*^?J2XXVi%1-3Qcz^upb){KlEEg%#JR4CgOPQi
klfyyD07W)7bpb|(>M)`In@zhbfkrZTy85}Sb4q9e0L6Jbc>n+a

literal 0
HcmV?d00001

diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json
index ad991eb..482275e 100644
--- a/src/uni_modules/tmui/locale/zh-Hans.json
+++ b/src/uni_modules/tmui/locale/zh-Hans.json
@@ -150,5 +150,5 @@
   "button.text.close": "关闭",
   "choose.deps.all": "全部",
   "choose.deps.current": "当前",
-  "msg.type": "图片"
+  "chat.mention.select": "选择提醒的人"
 }

From 36342b4dd958fd54232df5f4ce4313eb7139f7b4 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Wed, 12 Mar 2025 16:25:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=B0=81=E8=A3=85=E6=8C=89=E5=AD=97?=
 =?UTF-8?q?=E6=AF=8D=E9=80=89=E4=BA=BA=E9=A1=B5=E9=9D=A2=E4=B8=BA=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selectMemberByAlphabet.vue     | 669 +++++++++++++++++
 .../groupManage/selectMembers.vue             | 685 ++----------------
 src/pages/dialog/index.vue                    |  86 ++-
 src/static/image/chatList/groupAllMember.png  | Bin 0 -> 3118 bytes
 src/store/auth/index.js                       |   2 +-
 5 files changed, 819 insertions(+), 623 deletions(-)
 create mode 100644 src/pages/chatSettings/components/selectMemberByAlphabet.vue
 create mode 100644 src/static/image/chatList/groupAllMember.png

diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
new file mode 100644
index 0000000..f835497
--- /dev/null
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@@ -0,0 +1,669 @@
+<template>
+  <div class="select-member-by-alphabet">
+    <ZPaging
+      ref="zPaging"
+      :show-scrollbar="false"
+      :use-virtual-list="true"
+      :virtual-list-col="5"
+      :refresher-enabled="false"
+      :loading-more-enabled="false"
+      @scroll="onScroll"
+      :fixed="false"
+      :height="props?.selectAreaHeight"
+    >
+      <div class="select-members">
+        <div class="search-member" v-if="props?.manageType !== 'removeMembers'">
+          <customInput
+            :searchText="state.searchText"
+            @inputSearchText="inputSearchText"
+          ></customInput>
+        </div>
+        <div
+          class="member-list"
+          :style="{
+            padding: props?.manageType === 'searchRecord' ? '20rpx 0 0' : '',
+          }"
+        >
+          <div class="member-list-alphabet-anchor-point">
+            <div
+              class="member-list-alphabet-anchor-point-each"
+              v-for="(alphabetItem, alphabetIndex) in state?.alphabet"
+              :key="alphabetIndex"
+              :style="{
+                margin: state?.alphabet?.length > 17 ? '0' : '',
+              }"
+              @click.stop="scrollToView(alphabetItem)"
+            >
+              <span
+                class="text-[32rpx] font-regular"
+                :style="{
+                  color:
+                    state.currentAlphabet === alphabetItem ? '#7A58DE' : '',
+                }"
+              >
+                {{ alphabetItem }}
+              </span>
+            </div>
+          </div>
+          <div
+            class="member-list-alphabet"
+            v-for="(alphabetItem, alphabetIndex) in state.resultMemberList"
+            :key="alphabetIndex"
+          >
+            <div
+              class="member-list-alphabet-key"
+              :style="{
+                padding:
+                  props?.manageType === 'searchRecord' ||
+                  props?.manageType === 'removeMembers'
+                    ? '10rpx 30rpx'
+                    : '',
+              }"
+              v-if="alphabetItem?.memberList?.length > 0"
+              :id="alphabetItem.key"
+              :ref="
+                (el) => {
+                  if (el) alphabetElementRefs[alphabetIndex] = el
+                }
+              "
+            >
+              <span class="text-[32rpx] font-regular">
+                {{ alphabetItem.key }}
+              </span>
+            </div>
+            <div v-if="alphabetItem?.memberList?.length > 0">
+              <div
+                class="member-list-each"
+                v-for="(item, index) in alphabetItem?.memberList"
+                :key="index"
+              >
+                <tm-checkbox-group v-model="item.checkArr">
+                  <selectMemberItem
+                    :groupType="groupParams.groupInfo.group_type"
+                    :memberItem="item"
+                    @clickItem="handleClickItem(item)"
+                    :manageType="props?.manageType"
+                    :itemStyle="
+                      props?.manageType === 'searchRecord' ||
+                      props?.manageType === 'removeMembers'
+                        ? 'list'
+                        : 'card'
+                    "
+                  >
+                    <template #left v-if="props?.manageType !== 'searchRecord'">
+                      <div
+                        v-if="
+                          props?.manageType === 'removeMembers' && item?.is_mine
+                        "
+                      >
+                        <tm-checkbox
+                          color="#fff"
+                          :transprent="true"
+                          :border="0"
+                          :disabled="true"
+                        ></tm-checkbox>
+                      </div>
+                      <tm-checkbox
+                        v-if="
+                          !(
+                            props?.manageType === 'removeMembers' &&
+                            item?.is_mine
+                          )
+                        "
+                        :round="10"
+                        :color="
+                          item?.checkArr?.length > 0 ? '#46299d' : '#B4B4B4'
+                        "
+                        :outlined="
+                          item?.checkArr?.length > 0 ||
+                          (props?.manageType === 'silence' &&
+                            item.is_mute === 1) ||
+                          (props?.manageType === 'admin' &&
+                            (item.leader === 1 || item.leader === 2))
+                            ? false
+                            : true
+                        "
+                        :value="item.id"
+                        :disabled="
+                          (props?.manageType === 'silence' &&
+                            item.is_mute === 1) ||
+                          (props?.manageType === 'admin' &&
+                            (item.leader === 1 || item.leader === 2))
+                        "
+                        @change="checkBoxChange"
+                      ></tm-checkbox>
+                    </template>
+                  </selectMemberItem>
+                </tm-checkbox-group>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </ZPaging>
+  </div>
+</template>
+<script setup>
+import customInput from '@/components/custom-input/custom-input.vue'
+import selectMemberItem from '../components/select-member-item.vue'
+import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
+import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js'
+import {
+  computed,
+  onMounted,
+  reactive,
+  ref,
+  watch,
+  nextTick,
+  defineProps,
+  defineEmits,
+} from 'vue'
+import {
+  ServeGroupNoSpeak,
+  ServeEditGroupAdmin,
+  ServeGroupAssignAdmin,
+  ServeRemoveMembersGroup,
+} from '@/api/group/index.js'
+import { useDialogueStore, useGroupStore, useGroupTypeStore } from '@/store'
+
+const emits = defineEmits(['updateSelectedMembersNum'])
+
+const zPaging = ref()
+useZPaging(zPaging)
+
+const groupStore = useGroupStore()
+const groupParams = reactive({
+  groupInfo: computed(() => groupStore.groupInfo),
+})
+
+const groupTypeStore = useGroupTypeStore()
+const groupTypeParams = reactive({
+  departmentAllPositions: computed(() => groupTypeStore.departmentAllPositions),
+})
+
+const dialogueStore = useDialogueStore()
+const dialogueParams = reactive({
+  memberList: computed(() => {
+    const lowerCaseSearchText = state?.searchText.toLowerCase()
+    return dialogueStore.members.filter((item) =>
+      state?.searchText
+        ? item.nickname.toLowerCase().includes(lowerCaseSearchText)
+        : true,
+    )
+  }),
+  receiverId: computed(() => dialogueStore.talk.receiver_id),
+})
+
+const props = defineProps({
+  manageType: {
+    //管理类型
+    type: String,
+    default: '',
+  },
+  isCreateDepGroup: {
+    //是否是创建部门群
+    type: Number,
+    default: 0,
+  },
+  selectAreaHeight: {
+    //选择区域高度
+    type: String,
+    default: '',
+  },
+})
+
+const state = reactive({
+  searchText: '', //搜索内容
+  alphabet: [], //A-Z列表
+  currentAlphabet: 'A', //当前A-Z位置
+  resultMemberList: [], //按A-Z整理后的人员列表
+  isAssign: false, //是否指定view
+  scrollDirection: '', //当前列表滚动方向
+})
+
+watch(
+  () => dialogueParams?.memberList,
+  (newMemberList) => {
+    assembleAlphabetMemberList(newMemberList)
+  },
+  { deep: true },
+)
+
+watch(
+  () => groupParams?.groupInfo,
+  (newGroupInfo) => {
+    assembleAlphabetMemberList(dialogueParams?.memberList)
+  },
+  { deep: true },
+)
+
+//获取A-Z tag元素
+const alphabetElementRefs = ref([])
+//观察者
+let observer
+
+onMounted(() => {
+  if (props?.manageType) {
+    assembleAlphabetMemberList(dialogueParams?.memberList)
+  }
+  if (props?.isCreateDepGroup) {
+    assembleAlphabetMemberList()
+  }
+
+  dialogueParams.memberList.forEach((ele) => {
+    ele.checkArr = []
+  })
+
+  const options = {
+    root: null, // 使用浏览器窗口作为根容器
+    threshold: 1.0, // 当元素100%离开视口时触发
+  }
+  observer = new IntersectionObserver(handleIntersection, options)
+  nextTick(() => {
+    watch(
+      alphabetElementRefs,
+      (newAlphabetElementRefs) => {
+        if (Array.isArray(newAlphabetElementRefs)) {
+          newAlphabetElementRefs.forEach((el, index) => {
+            observeElement(el, index)
+          })
+        }
+      },
+      { immediate: true, deep: true },
+    )
+    if (alphabetElementRefs.value.length > 0) {
+      alphabetElementRefs.value.forEach((el, index) =>
+        observeElement(el, index),
+      )
+    }
+  })
+})
+
+//观察元素
+const observeElement = (el, index) => {
+  if (el && observer) {
+    observer.observe(el)
+  }
+}
+
+// 观察者函数
+const handleIntersection = (entries) => {
+  if (state.isAssign) {
+    state.isAssign = false
+    return
+  }
+  entries.forEach((entry) => {
+    if (!entry.isIntersecting && state.scrollDirection === 'down') {
+      state.currentAlphabet = entry.target.id
+    } else if (entry.isIntersecting && state.scrollDirection === 'up') {
+      if (state?.alphabet?.length > 1) {
+        state?.alphabet.forEach((item, index) => {
+          if (item === entry.target.id && index > 0) {
+            state.currentAlphabet = state?.alphabet[index - 1]
+          }
+        })
+      } else {
+        state.currentAlphabet = entry.target.id
+      }
+    }
+  })
+}
+
+//输入搜索文本
+const inputSearchText = (e) => {
+  // console.log(e)
+  state.searchText = e
+}
+
+//点击item
+const handleClickItem = (item) => {
+  if (
+    (props?.manageType === 'silence' && item.is_mute === 1) ||
+    (props?.manageType === 'admin' &&
+      (item.leader === 1 || item.leader === 2)) ||
+    (props?.manageType === 'removeMembers' && item.is_mine)
+  ) {
+    return
+  }
+  let itemList = dialogueParams.memberList
+  if (
+    props?.manageType === 'admin' &&
+    (groupParams.groupInfo.group_type == 2 ||
+      groupParams.groupInfo.group_type == 4 ||
+      props?.isCreateDepGroup === 1)
+  ) {
+    itemList = state.resultMemberList[0].memberList
+  }
+  itemList.forEach((ele) => {
+    if (ele.id == item.id) {
+      ele.checkArr = ele.checkArr?.length > 0 ? [] : [item.id]
+      if (ele.checkArr?.length > 0) {
+        emits('updateSelectedMembersNum', 1)
+      } else {
+        emits('updateSelectedMembersNum', -1)
+      }
+    }
+  })
+}
+
+//组装A-Z排序的人员列表
+const assembleAlphabetMemberList = async (newMemberList) => {
+  if (
+    props?.manageType === 'searchRecord' ||
+    props?.manageType === 'removeMembers'
+  ) {
+    const resultMemberList = ref([])
+    const alphabet = Array.from({ length: 26 }, (_, i) =>
+      String.fromCharCode(i + 65),
+    )
+    let tempAlphabet = []
+    alphabet.forEach((letter) => {
+      const matchedItems = newMemberList.filter((item) => item.key === letter)
+      if (matchedItems.length > 0) {
+        tempAlphabet.push(letter)
+      }
+      resultMemberList.value.push({
+        key: letter,
+        memberList: matchedItems.length ? matchedItems : [],
+      })
+    })
+    state.alphabet = tempAlphabet
+    state.resultMemberList = resultMemberList
+  } else {
+    if (
+      (groupParams.groupInfo.group_type == 2 ||
+        groupParams.groupInfo.group_type == 4) &&
+      props?.manageType === 'admin'
+    ) {
+      let departmentIdsArr = []
+      if (groupParams?.groupInfo?.deptInfos?.length > 0) {
+        groupParams.groupInfo.deptInfos.forEach((item) => {
+          departmentIdsArr.push(item.dept_id)
+        })
+      }
+      getPosiByDep(departmentIdsArr)
+    } else if (props?.isCreateDepGroup === 1) {
+      let departmentIdsArr = []
+      if (groupTypeStore?.depCheckedKeys?.value?.length > 0) {
+        groupTypeStore.depCheckedKeys.value.forEach((item) => {
+          departmentIdsArr.push(item.ID)
+        })
+      }
+      getPosiByDep(departmentIdsArr)
+    } else {
+      state.resultMemberList = [
+        {
+          key: '',
+          memberList: newMemberList,
+        },
+      ]
+    }
+  }
+}
+
+//按部门获取岗位
+const getPosiByDep = async (departmentIdsArr) => {
+  await groupTypeStore.getPositionByDepartment({
+    IDs: departmentIdsArr,
+  })
+  let departmentAllPositions = []
+  if (groupTypeParams?.departmentAllPositions?.value?.length > 0) {
+    groupTypeParams?.departmentAllPositions?.value?.forEach((item) => {
+      item?.AllPositions?.forEach((positionItem) => {
+        departmentAllPositions.push({
+          nickname: item.name + '-' + positionItem.name,
+          id: item.ID + '-' + positionItem.ID,
+          checkArr: [],
+          positionInfo: {
+            dept_id: item.ID,
+            dept_name: item.name,
+            position_id: positionItem.ID,
+            position_name: positionItem.name,
+          },
+        })
+      })
+    })
+  }
+  if (groupParams?.groupInfo?.groupAdminList?.length > 0) {
+    groupParams?.groupInfo?.groupAdminList.forEach((item) => {
+      departmentAllPositions.forEach((idsItem) => {
+        if (item.dept_id + '-' + item.position_id == idsItem.id) {
+          idsItem.leader = 1
+        }
+      })
+    })
+  }
+  if (
+    props?.isCreateDepGroup === 1 &&
+    groupTypeStore?.groupAdmins?.value?.length > 0
+  ) {
+    departmentAllPositions.forEach((allPos) => {
+      groupTypeStore.groupAdmins.value.forEach((admin) => {
+        if (allPos.id === admin.id) {
+          allPos.checkArr = [allPos.id]
+        }
+      })
+    })
+  }
+  if (state?.searchText) {
+    const lowerCaseSearchText = state?.searchText.toLowerCase()
+    departmentAllPositions = departmentAllPositions.filter((item) =>
+      state?.searchText
+        ? item.nickname.toLowerCase().includes(lowerCaseSearchText)
+        : true,
+    )
+  }
+  state.resultMemberList = [
+    {
+      key: '',
+      memberList: departmentAllPositions,
+    },
+  ]
+}
+
+//滚动到指定的view
+const scrollToView = (alphabet) => {
+  state.currentAlphabet = alphabet
+  state.isAssign = true
+  console.log()
+  zPaging.value?.scrollIntoViewById(
+    alphabet,
+    document.getElementById('topArea').clientHeight
+      ? document.getElementById('topArea').clientHeight - 1
+      : 80,
+  )
+}
+
+//监听列表滚动
+const onScroll = (e) => {
+  if (e.detail.deltaY < 0) {
+    state.scrollDirection = 'down'
+  } else if (e.detail.deltaY > 0) {
+    state.scrollDirection = 'up'
+  } else {
+    state.scrollDirection = ''
+  }
+}
+
+//选中的人员改变
+const checkBoxChange = (e) => {
+  if (e) {
+    emits('updateSelectedMembersNum', 1)
+  } else {
+    emits('updateSelectedMembersNum', -1)
+  }
+}
+
+//点击确认选择的成员
+const confirmSelectMembers = () => {
+  let selectedUserIds = ''
+  let itemList = dialogueParams.memberList
+  let positionInfos = []
+  if (
+    props?.manageType === 'admin' &&
+    (groupParams.groupInfo.group_type == 2 ||
+      groupParams.groupInfo.group_type == 4 ||
+      props?.isCreateDepGroup === 1)
+  ) {
+    itemList = state.resultMemberList[0].memberList
+  }
+  itemList.forEach((ele) => {
+    if (ele.checkArr?.length > 0) {
+      if (!selectedUserIds) {
+        selectedUserIds = String(ele.checkArr[0])
+      } else {
+        selectedUserIds += ',' + ele.checkArr[0]
+      }
+    }
+    if (
+      ele.checkArr?.length > 0 ||
+      (ele.leader && (ele.leader == 1 || ele.leader == 2))
+    ) {
+      if (props?.isCreateDepGroup === 1) {
+        let posInfo = Object.assign({}, ele.positionInfo, {
+          name: ele.nickname,
+          id: ele.id,
+        })
+        positionInfos.push(posInfo)
+      } else {
+        positionInfos.push(ele.positionInfo)
+      }
+    }
+  })
+  console.log(selectedUserIds)
+  if (selectedUserIds) {
+    if (props?.manageType === 'silence') {
+      let params = {
+        mode: 1, //1禁言2解禁
+        group_id: dialogueParams.receiverId, //群id
+        user_ids: selectedUserIds, //用户ids
+      }
+      console.log(params)
+      const resp = ServeGroupNoSpeak(params)
+      resp.then(({ code, data }) => {
+        console.log(data)
+        if (code == 200) {
+          useDialogueStore().updateGroupMembers()
+        } else {
+        }
+      })
+      resp.catch(() => {})
+    } else if (props?.manageType === 'admin') {
+      if (props?.isCreateDepGroup === 1) {
+        // console.log(positionInfos)
+        groupTypeStore.groupAdmins.value = positionInfos
+        uni.navigateBack({
+          delta: 1,
+        })
+      } else {
+        if (
+          groupParams.groupInfo.group_type == 1 ||
+          groupParams.groupInfo.group_type == 3
+        ) {
+          let params = {
+            mode: 1, //1管理员，2不是管理员
+            group_id: dialogueParams.receiverId, //群id
+            user_ids: selectedUserIds,
+          }
+          console.log(params)
+          const resp = ServeGroupAssignAdmin(params)
+          resp.then(({ code, data }) => {
+            console.log(data)
+            if (code == 200) {
+              useDialogueStore().updateGroupMembers()
+            } else {
+            }
+          })
+          resp.catch(() => {})
+        } else if (
+          groupParams.groupInfo.group_type == 2 ||
+          groupParams.groupInfo.group_type == 4
+        ) {
+          let params = {
+            source: 'app',
+            id: dialogueParams.receiverId,
+            deptInfos: groupParams.groupInfo.deptInfos,
+            positionInfos: positionInfos,
+          }
+          console.log(params)
+          const resp = ServeEditGroupAdmin(params)
+          resp.then(({ code, data }) => {
+            console.log(data)
+            if (code == 200) {
+              groupStore.ServeGroupDetail()
+            } else {
+            }
+          })
+          resp.catch(() => {})
+        }
+      }
+    } else if (props?.manageType === 'removeMembers') {
+      let params = {
+        group_id: dialogueParams.receiverId, //群id
+        members_ids: selectedUserIds, //群成员id，批量的话逗号分割
+      }
+      console.log(params)
+      const resp = ServeRemoveMembersGroup(params)
+      resp.then(({ code, data }) => {
+        console.log(data)
+        if (code == 200) {
+          useDialogueStore().updateGroupMembers()
+          groupStore.ServeGroupDetail()
+        } else {
+        }
+      })
+      resp.catch(() => {})
+    }
+  }
+}
+
+// 暴露确认方法
+defineExpose({
+  confirmSelectMembers,
+})
+</script>
+<style lang="scss" scoped>
+.select-member-by-alphabet {
+  .select-members {
+    padding: 20rpx 32rpx;
+    .search-member {
+      padding: 22rpx 16rpx;
+      background-color: #fff;
+    }
+    .member-list {
+      .member-list-alphabet-anchor-point {
+        position: fixed;
+        right: 32rpx;
+        top: 0;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        .member-list-alphabet-anchor-point-each {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          margin: 0 0 14rpx;
+          span {
+            width: 52rpx;
+            text-align: center;
+            line-height: 44rpx;
+            color: $theme-text;
+          }
+        }
+      }
+      .member-list-alphabet {
+        .member-list-alphabet-key {
+          background-color: #f3f3f3;
+          span {
+            line-height: 44rpx;
+            color: $theme-text;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/chatSettings/groupManage/selectMembers.vue b/src/pages/chatSettings/groupManage/selectMembers.vue
index c2ec86a..201e6ac 100644
--- a/src/pages/chatSettings/groupManage/selectMembers.vue
+++ b/src/pages/chatSettings/groupManage/selectMembers.vue
@@ -11,170 +11,45 @@
         @scroll="onScroll"
       >
         <template #top>
-          <customNavbar :title="pageTitle" id="topArea"></customNavbar>
+          <div id="topArea">
+            <customNavbar :title="pageTitle"></customNavbar>
+          </div>
         </template>
-        <div class="select-members">
-          <div
-            class="search-member"
-            v-if="state.manageType !== 'removeMembers'"
-          >
-            <customInput
-              :searchText="state.searchText"
-              @inputSearchText="inputSearchText"
-            ></customInput>
-          </div>
-          <div
-            class="member-list"
-            :style="{
-              padding: state.manageType === 'searchRecord' ? '20rpx 0 0' : '',
-            }"
-          >
-            <div class="member-list-alphabet-anchor-point">
-              <div
-                class="member-list-alphabet-anchor-point-each"
-                v-for="(alphabetItem, alphabetIndex) in state?.alphabet"
-                :key="alphabetIndex"
-                :style="{
-                  margin: state?.alphabet?.length > 17 ? '0' : '',
-                }"
-                @click.stop="scrollToView(alphabetItem)"
-              >
-                <span
-                  class="text-[32rpx] font-regular"
-                  :style="{
-                    color:
-                      state.currentAlphabet === alphabetItem ? '#7A58DE' : '',
-                  }"
-                >
-                  {{ alphabetItem }}
-                </span>
-              </div>
-            </div>
-            <div
-              class="member-list-alphabet"
-              v-for="(alphabetItem, alphabetIndex) in state.resultMemberList"
-              :key="alphabetIndex"
-            >
-              <div
-                class="member-list-alphabet-key"
-                :style="{
-                  padding:
-                    state.manageType === 'searchRecord' ||
-                    state.manageType === 'removeMembers'
-                      ? '10rpx 30rpx'
-                      : '',
-                }"
-                v-if="alphabetItem?.memberList?.length > 0"
-                :id="alphabetItem.key"
-                :ref="
-                  (el) => {
-                    if (el) alphabetElementRefs[alphabetIndex] = el
-                  }
-                "
-              >
-                <span class="text-[32rpx] font-regular">
-                  {{ alphabetItem.key }}
-                </span>
-              </div>
-              <div v-if="alphabetItem?.memberList?.length > 0">
-                <div
-                  class="member-list-each"
-                  v-for="(item, index) in alphabetItem?.memberList"
-                  :key="index"
-                >
-                  <tm-checkbox-group v-model="item.checkArr">
-                    <selectMemberItem
-                      :groupType="groupParams.groupInfo.group_type"
-                      :memberItem="item"
-                      @clickItem="handleClickItem(item)"
-                      :manageType="state.manageType"
-                      :itemStyle="
-                        state.manageType === 'searchRecord' ||
-                        state.manageType === 'removeMembers'
-                          ? 'list'
-                          : 'card'
-                      "
-                    >
-                      <template
-                        #left
-                        v-if="state.manageType !== 'searchRecord'"
-                      >
-                        <div
-                          v-if="
-                            state.manageType === 'removeMembers' &&
-                            item?.is_mine
-                          "
-                        >
-                          <tm-checkbox
-                            color="#fff"
-                            :transprent="true"
-                            :border="0"
-                            :disabled="true"
-                          ></tm-checkbox>
-                        </div>
-                        <tm-checkbox
-                          v-if="
-                            !(
-                              state.manageType === 'removeMembers' &&
-                              item?.is_mine
-                            )
-                          "
-                          :round="10"
-                          :color="
-                            item?.checkArr?.length > 0 ? '#46299d' : '#B4B4B4'
-                          "
-                          :outlined="
-                            item?.checkArr?.length > 0 ||
-                            (state.manageType === 'silence' &&
-                              item.is_mute === 1) ||
-                            (state.manageType === 'admin' &&
-                              (item.leader === 1 || item.leader === 2))
-                              ? false
-                              : true
-                          "
-                          :value="item.id"
-                          :disabled="
-                            (state.manageType === 'silence' &&
-                              item.is_mute === 1) ||
-                            (state.manageType === 'admin' &&
-                              (item.leader === 1 || item.leader === 2))
-                          "
-                          @change="checkBoxChange"
-                        ></tm-checkbox>
-                      </template>
-                    </selectMemberItem>
-                  </tm-checkbox-group>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
+        <selectMemberByAlphabet
+          :manageType="state.manageType"
+          :isCreateDepGroup="state.isCreateDepGroup"
+          ref="selectMemberByAlphabetRef"
+          :selectAreaHeight="state.selectAreaHeight"
+          @updateSelectedMembersNum="updateSelectedMembersNum"
+        ></selectMemberByAlphabet>
         <template #bottom v-if="state.manageType !== 'searchRecord'">
-          <customBtn
-            v-if="state.manageType !== 'removeMembers'"
-            :isBottom="true"
-            :btnText="$t('ok')"
-            @clickBtn="confirmSelectMembers"
-          ></customBtn>
-          <div
-            class="confirm-btn-area"
-            v-if="state.manageType === 'removeMembers'"
-          >
-            <div class="confirm-btn-area-statistic-text">
-              <span class="text-[28rpx] font-medium">
-                {{
-                  $t('select.member.num') +
-                  '：' +
-                  state.selectedMembersNum +
-                  $t('statistic.unit.person')
-                }}
-              </span>
-            </div>
+          <div id="footArea">
             <customBtn
+              v-if="state.manageType !== 'removeMembers'"
+              :isBottom="true"
               :btnText="$t('ok')"
               @clickBtn="confirmSelectMembers"
-              :disabled="state.selectedMembersNum == 0 ? true : false"
             ></customBtn>
+            <div
+              class="confirm-btn-area"
+              v-if="state.manageType === 'removeMembers'"
+            >
+              <div class="confirm-btn-area-statistic-text">
+                <span class="text-[28rpx] font-medium">
+                  {{
+                    $t('select.member.num') +
+                    '：' +
+                    state.selectedMembersNum +
+                    $t('statistic.unit.person')
+                  }}
+                </span>
+              </div>
+              <customBtn
+                :btnText="$t('ok')"
+                @clickBtn="confirmSelectMembers"
+                :disabled="state.selectedMembersNum == 0 ? true : false"
+              ></customBtn>
+            </div>
           </div>
         </template>
       </ZPaging>
@@ -182,120 +57,63 @@
   </div>
 </template>
 <script setup>
-import customInput from '@/components/custom-input/custom-input.vue'
-import selectMemberItem from '../components/select-member-item.vue'
+import selectMemberByAlphabet from '../components/selectMemberByAlphabet.vue'
 import customBtn from '@/components/custom-btn/custom-btn.vue'
 import ZPaging from '@/uni_modules/z-paging/components/z-paging/z-paging.vue'
 import useZPaging from '@/uni_modules/z-paging/components/z-paging/js/hooks/useZPaging.js'
-import { computed, onMounted, reactive, ref, watch, nextTick } from 'vue'
+import { computed, reactive, ref, onMounted, nextTick } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
-import {
-  ServeGroupNoSpeak,
-  ServeEditGroupAdmin,
-  ServeGroupAssignAdmin,
-  ServeRemoveMembersGroup,
-} from '@/api/group/index.js'
-import { useDialogueStore, useGroupStore, useGroupTypeStore } from '@/store'
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
 
+const selectMemberByAlphabetRef = ref(null)
+
 const zPaging = ref()
 useZPaging(zPaging)
 
-const groupStore = useGroupStore()
-const groupParams = reactive({
-  groupInfo: computed(() => groupStore.groupInfo),
-})
-
-const groupTypeStore = useGroupTypeStore()
-const groupTypeParams = reactive({
-  departmentAllPositions: computed(() => groupTypeStore.departmentAllPositions),
-})
-
-const dialogueStore = useDialogueStore()
-const dialogueParams = reactive({
-  memberList: computed(() => {
-    const lowerCaseSearchText = state?.searchText.toLowerCase()
-    return dialogueStore.members.filter((item) =>
-      state?.searchText
-        ? item.nickname.toLowerCase().includes(lowerCaseSearchText)
-        : true,
-    )
-  }),
-  receiverId: computed(() => dialogueStore.talk.receiver_id),
-})
-
 const state = reactive({
-  searchText: '', //搜索内容
   manageType: '', //管理类型
-  alphabet: [], //A-Z列表
-  resultMemberList: [], //按A-Z整理后的人员列表
-  currentAlphabet: 'A', //当前A-Z位置
-  scrollDirection: '', //当前列表滚动方向
-  isAssign: false, //是否指定view
   selectedMembersNum: 0, //当前选中数量
   isCreateDepGroup: 0, //是否是创建部门群
+  selectAreaHeight: 0, //选择区域高度
 })
 
-watch(
-  () => dialogueParams?.memberList,
-  (newMemberList) => {
-    assembleAlphabetMemberList(newMemberList)
-  },
-  { deep: true },
-)
-
-watch(
-  () => groupParams?.groupInfo,
-  (newGroupInfo) => {
-    assembleAlphabetMemberList(dialogueParams?.memberList)
-  },
-  { deep: true },
-)
-
-//获取A-Z tag元素
-const alphabetElementRefs = ref([])
-//观察者
-let observer
-
 onLoad((options) => {
-  console.log(options)
+  // console.log(options)
   if (options.manageType) {
     state.manageType = options.manageType
-    assembleAlphabetMemberList(dialogueParams?.memberList)
   }
   if (options.isCreateDepGroup) {
     state.isCreateDepGroup = Number(options.isCreateDepGroup)
-    assembleAlphabetMemberList()
   }
 })
 
 onMounted(() => {
-  dialogueParams.memberList.forEach((ele) => {
-    ele.checkArr = []
-  })
-  const options = {
-    root: null, // 使用浏览器窗口作为根容器
-    threshold: 1.0, // 当元素100%离开视口时触发
-  }
-  observer = new IntersectionObserver(handleIntersection, options)
   nextTick(() => {
-    watch(
-      alphabetElementRefs,
-      (newAlphabetElementRefs) => {
-        if (Array.isArray(newAlphabetElementRefs)) {
-          newAlphabetElementRefs.forEach((el, index) => {
-            observeElement(el, index)
-          })
+    let selectAreaHeight = uni.getSystemInfoSync().windowHeight
+    // console.log('页面高度:', uni.getSystemInfoSync().windowHeight)
+    const topAreaQuery = uni.createSelectorQuery()
+    topAreaQuery
+      .select('#topArea')
+      .boundingClientRect((res) => {
+        if (res) {
+          // console.log('元素高度:', res.height)
+          selectAreaHeight = selectAreaHeight - res.height
         }
-      },
-      { immediate: true, deep: true },
-    )
-    if (alphabetElementRefs.value.length > 0) {
-      alphabetElementRefs.value.forEach((el, index) =>
-        observeElement(el, index),
-      )
-    }
+      })
+      .exec()
+    const footAreaQuery = uni.createSelectorQuery()
+    footAreaQuery
+      .select('#footArea')
+      .boundingClientRect((res) => {
+        if (res) {
+          // console.log('元素高度:', res.height)
+          selectAreaHeight = selectAreaHeight - res.height
+        }
+      })
+      .exec()
+    // console.log(selectAreaHeight)
+    state.selectAreaHeight = selectAreaHeight + 'px'
   })
 })
 
@@ -314,341 +132,16 @@ const pageTitle = computed(() => {
   return page_title
 })
 
-// 观察者函数
-const handleIntersection = (entries) => {
-  if (state.isAssign) {
-    state.isAssign = false
-    return
-  }
-  entries.forEach((entry) => {
-    if (!entry.isIntersecting && state.scrollDirection === 'down') {
-      state.currentAlphabet = entry.target.id
-    } else if (entry.isIntersecting && state.scrollDirection === 'up') {
-      if (state?.alphabet?.length > 1) {
-        state?.alphabet.forEach((item, index) => {
-          if (item === entry.target.id && index > 0) {
-            state.currentAlphabet = state?.alphabet[index - 1]
-          }
-        })
-      } else {
-        state.currentAlphabet = entry.target.id
-      }
-    }
-  })
-}
-
-//观察元素
-const observeElement = (el, index) => {
-  if (el && observer) {
-    observer.observe(el)
-  }
-}
-
-//输入搜索文本
-const inputSearchText = (e) => {
-  // console.log(e)
-  state.searchText = e
-}
-
-//点击item
-const handleClickItem = (item) => {
-  if (
-    (state.manageType === 'silence' && item.is_mute === 1) ||
-    (state.manageType === 'admin' &&
-      (item.leader === 1 || item.leader === 2)) ||
-    (state.manageType === 'removeMembers' && item.is_mine)
-  ) {
-    return
-  }
-  let itemList = dialogueParams.memberList
-  if (
-    state.manageType === 'admin' &&
-    (groupParams.groupInfo.group_type == 2 ||
-      groupParams.groupInfo.group_type == 4 ||
-      state.isCreateDepGroup === 1)
-  ) {
-    itemList = state.resultMemberList[0].memberList
-  }
-  itemList.forEach((ele) => {
-    if (ele.id == item.id) {
-      ele.checkArr = ele.checkArr?.length > 0 ? [] : [item.id]
-      if (ele.checkArr?.length > 0) {
-        state.selectedMembersNum += 1
-      } else {
-        state.selectedMembersNum -= 1
-      }
-    }
-  })
-}
-
-//点击确认选择的成员
+//确认
 const confirmSelectMembers = () => {
-  let selectedUserIds = ''
-  let itemList = dialogueParams.memberList
-  let positionInfos = []
-  if (
-    state.manageType === 'admin' &&
-    (groupParams.groupInfo.group_type == 2 ||
-      groupParams.groupInfo.group_type == 4 ||
-      state.isCreateDepGroup === 1)
-  ) {
-    itemList = state.resultMemberList[0].memberList
-  }
-  itemList.forEach((ele) => {
-    if (ele.checkArr?.length > 0) {
-      if (!selectedUserIds) {
-        selectedUserIds = String(ele.checkArr[0])
-      } else {
-        selectedUserIds += ',' + ele.checkArr[0]
-      }
-    }
-    if (
-      ele.checkArr?.length > 0 ||
-      (ele.leader && (ele.leader == 1 || ele.leader == 2))
-    ) {
-      if (state.isCreateDepGroup === 1) {
-        let posInfo = Object.assign({}, ele.positionInfo, {
-          name: ele.nickname,
-          id: ele.id,
-        })
-        positionInfos.push(posInfo)
-      } else {
-        positionInfos.push(ele.positionInfo)
-      }
-    }
-  })
-  console.log(selectedUserIds)
-  if (selectedUserIds) {
-    if (state.manageType === 'silence') {
-      let params = {
-        mode: 1, //1禁言2解禁
-        group_id: dialogueParams.receiverId, //群id
-        user_ids: selectedUserIds, //用户ids
-      }
-      console.log(params)
-      const resp = ServeGroupNoSpeak(params)
-      resp.then(({ code, data }) => {
-        console.log(data)
-        if (code == 200) {
-          useDialogueStore().updateGroupMembers()
-        } else {
-        }
-      })
-      resp.catch(() => {})
-    } else if (state.manageType === 'admin') {
-      if (state.isCreateDepGroup === 1) {
-        // console.log(positionInfos)
-        groupTypeStore.groupAdmins.value = positionInfos
-        uni.navigateBack({
-          delta: 1,
-        })
-      } else {
-        if (
-          groupParams.groupInfo.group_type == 1 ||
-          groupParams.groupInfo.group_type == 3
-        ) {
-          let params = {
-            mode: 1, //1管理员，2不是管理员
-            group_id: dialogueParams.receiverId, //群id
-            user_ids: selectedUserIds,
-          }
-          console.log(params)
-          const resp = ServeGroupAssignAdmin(params)
-          resp.then(({ code, data }) => {
-            console.log(data)
-            if (code == 200) {
-              useDialogueStore().updateGroupMembers()
-            } else {
-            }
-          })
-          resp.catch(() => {})
-        } else if (
-          groupParams.groupInfo.group_type == 2 ||
-          groupParams.groupInfo.group_type == 4
-        ) {
-          let params = {
-            source: 'app',
-            id: dialogueParams.receiverId,
-            deptInfos: groupParams.groupInfo.deptInfos,
-            positionInfos: positionInfos,
-          }
-          console.log(params)
-          const resp = ServeEditGroupAdmin(params)
-          resp.then(({ code, data }) => {
-            console.log(data)
-            if (code == 200) {
-              groupStore.ServeGroupDetail()
-            } else {
-            }
-          })
-          resp.catch(() => {})
-        }
-      }
-    } else if (state.manageType === 'removeMembers') {
-      let params = {
-        group_id: dialogueParams.receiverId, //群id
-        members_ids: selectedUserIds, //群成员id，批量的话逗号分割
-      }
-      console.log(params)
-      const resp = ServeRemoveMembersGroup(params)
-      resp.then(({ code, data }) => {
-        console.log(data)
-        if (code == 200) {
-          useDialogueStore().updateGroupMembers()
-          groupStore.ServeGroupDetail()
-        } else {
-        }
-      })
-      resp.catch(() => {})
-    }
+  if (selectMemberByAlphabetRef.value) {
+    selectMemberByAlphabetRef.value.confirmSelectMembers()
   }
 }
 
-//组装A-Z排序的人员列表
-const assembleAlphabetMemberList = async (newMemberList) => {
-  if (
-    state.manageType === 'searchRecord' ||
-    state.manageType === 'removeMembers'
-  ) {
-    const resultMemberList = ref([])
-    const alphabet = Array.from({ length: 26 }, (_, i) =>
-      String.fromCharCode(i + 65),
-    )
-    let tempAlphabet = []
-    alphabet.forEach((letter) => {
-      const matchedItems = newMemberList.filter((item) => item.key === letter)
-      if (matchedItems.length > 0) {
-        tempAlphabet.push(letter)
-      }
-      resultMemberList.value.push({
-        key: letter,
-        memberList: matchedItems.length ? matchedItems : [],
-      })
-    })
-    state.alphabet = tempAlphabet
-    state.resultMemberList = resultMemberList
-  } else {
-    if (
-      (groupParams.groupInfo.group_type == 2 ||
-        groupParams.groupInfo.group_type == 4) &&
-      state.manageType === 'admin'
-    ) {
-      let departmentIdsArr = []
-      if (groupParams?.groupInfo?.deptInfos?.length > 0) {
-        groupParams.groupInfo.deptInfos.forEach((item) => {
-          departmentIdsArr.push(item.dept_id)
-        })
-      }
-      getPosiByDep(departmentIdsArr)
-    } else if (state.isCreateDepGroup === 1) {
-      let departmentIdsArr = []
-      if (groupTypeStore?.depCheckedKeys?.value?.length > 0) {
-        groupTypeStore.depCheckedKeys.value.forEach((item) => {
-          departmentIdsArr.push(item.ID)
-        })
-      }
-      getPosiByDep(departmentIdsArr)
-    } else {
-      state.resultMemberList = [
-        {
-          key: '',
-          memberList: newMemberList,
-        },
-      ]
-    }
-  }
-}
-
-const getPosiByDep = async (departmentIdsArr) => {
-  await groupTypeStore.getPositionByDepartment({
-    IDs: departmentIdsArr,
-  })
-  let departmentAllPositions = []
-  if (groupTypeParams?.departmentAllPositions?.value?.length > 0) {
-    groupTypeParams?.departmentAllPositions?.value?.forEach((item) => {
-      item?.AllPositions?.forEach((positionItem) => {
-        departmentAllPositions.push({
-          nickname: item.name + '-' + positionItem.name,
-          id: item.ID + '-' + positionItem.ID,
-          checkArr: [],
-          positionInfo: {
-            dept_id: item.ID,
-            dept_name: item.name,
-            position_id: positionItem.ID,
-            position_name: positionItem.name,
-          },
-        })
-      })
-    })
-  }
-  if (groupParams?.groupInfo?.groupAdminList?.length > 0) {
-    groupParams?.groupInfo?.groupAdminList.forEach((item) => {
-      departmentAllPositions.forEach((idsItem) => {
-        if (item.dept_id + '-' + item.position_id == idsItem.id) {
-          idsItem.leader = 1
-        }
-      })
-    })
-  }
-  if (
-    state.isCreateDepGroup === 1 &&
-    groupTypeStore?.groupAdmins?.value?.length > 0
-  ) {
-    departmentAllPositions.forEach((allPos) => {
-      groupTypeStore.groupAdmins.value.forEach((admin) => {
-        if (allPos.id === admin.id) {
-          allPos.checkArr = [allPos.id]
-        }
-      })
-    })
-  }
-  if(state?.searchText){
-    const lowerCaseSearchText = state?.searchText.toLowerCase()
-    departmentAllPositions = departmentAllPositions.filter((item) =>
-      state?.searchText
-        ? item.nickname.toLowerCase().includes(lowerCaseSearchText)
-        : true,
-    )
-  }
-  state.resultMemberList = [
-    {
-      key: '',
-      memberList: departmentAllPositions,
-    },
-  ]
-}
-
-//滚动到指定的view
-const scrollToView = (alphabet) => {
-  state.currentAlphabet = alphabet
-  state.isAssign = true
-  console.log()
-  zPaging.value?.scrollIntoViewById(
-    alphabet,
-    document.getElementById('topArea').clientHeight
-      ? document.getElementById('topArea').clientHeight - 1
-      : 80,
-  )
-}
-
-//监听列表滚动
-const onScroll = (e) => {
-  if (e.detail.deltaY < 0) {
-    state.scrollDirection = 'down'
-  } else if (e.detail.deltaY > 0) {
-    state.scrollDirection = 'up'
-  } else {
-    state.scrollDirection = ''
-  }
-}
-
-//选中的人员改变
-const checkBoxChange = (e) => {
-  if (e) {
-    state.selectedMembersNum += 1
-  } else {
-    state.selectedMembersNum -= 1
-  }
+//更新选中的人数
+const updateSelectedMembersNum = (numChange) => {
+  state.selectedMembersNum = state.selectedMembersNum + numChange
 }
 </script>
 <style scoped lang="scss">
@@ -659,48 +152,6 @@ const checkBoxChange = (e) => {
   background-repeat: no-repeat;
 }
 
-.select-members {
-  padding: 20rpx 32rpx;
-  .search-member {
-    padding: 22rpx 16rpx;
-    background-color: #fff;
-  }
-  .member-list {
-    .member-list-alphabet-anchor-point {
-      position: fixed;
-      right: 32rpx;
-      top: 0;
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      justify-content: center;
-      .member-list-alphabet-anchor-point-each {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        margin: 0 0 14rpx;
-        span {
-          width: 52rpx;
-          text-align: center;
-          line-height: 44rpx;
-          color: $theme-text;
-        }
-      }
-    }
-    .member-list-alphabet {
-      .member-list-alphabet-key {
-        background-color: #f3f3f3;
-        span {
-          line-height: 44rpx;
-          color: $theme-text;
-        }
-      }
-    }
-  }
-}
-
 .confirm-btn-area {
   background-color: #fff;
   padding: 14rpx 32rpx 72rpx;
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index 23f340e..f4d5242 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -342,7 +342,13 @@
         </div>
       </template>
     </ZPaging>
-    <tm-drawer placement="bottom" :show="true" :hideHeader="true" :round="5">
+    <tm-drawer
+      placement="bottom"
+      :show="state.isShowMentionSelect"
+      :hideHeader="true"
+      :round="5"
+      :height="state.mentionSelectHeight"
+    >
       <div
         class="mention-select-drawer flex flex-row flex-1 flex-row flex-row-center-between"
       >
@@ -350,7 +356,11 @@
           class="cancel-btns flex-row flex flex-row-center-start"
           style="width: 210rpx;"
         >
-          <div class="hide-btn" v-if="!state.mentionIsMulSelect">
+          <div
+            class="hide-btn"
+            v-if="!state.mentionIsMulSelect"
+            @click="hideMentionSelect"
+          >
             <img
               style="width: 40rpx; height: 40rpx;"
               src="/src/static/image/chatList/mention_select_hide_bg.png"
@@ -394,21 +404,36 @@
           <div
             class="mention-done-btn"
             :class="
-              state?.mentionSelectComplete ? 'mention-done-btn-can-do' : ''
+              state?.selectedMembersNum > 0 ? 'mention-done-btn-can-do' : ''
             "
             v-if="state.mentionIsMulSelect"
-            @click="changeToSelectMode"
+            @click="confirmMentionSelect"
           >
             <span class="text-[32rpx] font-regular text-[#191919]">
               {{ $t('button.text.done') }}
             </span>
+            <span
+              class="text-[32rpx] font-regular text-[#191919]"
+              v-if="state?.selectedMembersNum > 0"
+            >
+              {{ '(' + state?.selectedMembersNum + ')' }}
+            </span>
           </div>
         </div>
       </div>
+      <selectMemberByAlphabet
+        :manageType="'mention'"
+        ref="selectMemberByAlphabetRef"
+        :selectAreaHeight="state.selectAreaHeight"
+        @updateSelectedMembersNum="updateSelectedMembersNum"
+        :isMulSelect="state.mentionIsMulSelect"
+        @getSelectResult="getSelectResult"
+      ></selectMemberByAlphabet>
     </tm-drawer>
   </div>
 </template>
 <script setup>
+import selectMemberByAlphabet from '../chatSettings/components/selectMemberByAlphabet.vue'
 import {
   ref,
   reactive,
@@ -465,6 +490,8 @@ import { onLoad as uniOnload } from '@dcloudio/uni-app'
 
 Quill.register('formats/emoji', EmojiBlot)
 
+const selectMemberByAlphabetRef = ref(null)
+
 const {
   getDialogueList,
   updateZpagingRef,
@@ -500,6 +527,10 @@ const state = ref({
   localPageLoadDone: true, //分页加载缓存中的聊天记录是否完毕
   quoteInfo: null, //引用信息
   mentionIsMulSelect: false, //是否是多选提醒的人
+  selectedMembersNum: 0, //选中的要提醒的人数
+  mentionSelectHeight: 0, //选择要提醒人的区域高度
+  selectAreaHeight: 0, //选择要提醒人的可选人员列表区域高度
+  isShowMentionSelect: true, //是否显示要提醒人的选择区域
 })
 
 uniOnload((options) => {
@@ -934,6 +965,11 @@ const handleDelete = () => {
   })
 }
 
+//更新选中的要提醒的人数
+const updateSelectedMembersNum = (numChange) => {
+  state.value.selectedMembersNum = state.value.selectedMembersNum + numChange
+}
+
 watch(
   () => zpagingRef.value,
   (newValue, oldValue) => {
@@ -1018,10 +1054,50 @@ const changeMentionSelectMul = (status) => {
   state.value.mentionIsMulSelect = status
 }
 
+//隐藏要提醒人的选择
+const hideMentionSelect = () => {
+  state.value.isShowMentionSelect = false
+}
+
+//确认要提醒人的选择
+const confirmMentionSelect = () => {
+  if (state?.value.selectedMembersNum > 0) {
+    if (selectMemberByAlphabetRef.value) {
+      selectMemberByAlphabetRef.value.confirmSelectMembers()
+    }
+    hideMentionSelect()
+  }
+}
+
+//获取选择的结果
+const getSelectResult = (mentionSelect) => {
+  console.log(mentionSelect)
+}
+
 onMounted(async () => {
   initData()
+  nextTick(() => {
+    state.value.mentionSelectHeight = pxTorPx(
+      uni.getSystemInfoSync().windowHeight * 0.86,
+    )
+
+    state.value.selectAreaHeight =
+      rpxToPx(state.value.mentionSelectHeight) - rpxToPx(90) + 'px'
+  })
 })
 
+const pxTorPx = (px) => {
+  const sysInfo = uni.getSystemInfoSync()
+  const rpx = px / (sysInfo.screenWidth / 750)
+  return rpx
+}
+
+const rpxToPx = (rpx) => {
+  const sysInfo = uni.getSystemInfoSync()
+  const px = (sysInfo.screenWidth / 750) * rpx
+  return px
+}
+
 onUnmounted(() => {
   dialogueStore.setDialogue({})
   clearMultiSelect()
@@ -1346,7 +1422,7 @@ onUnmounted(() => {
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  padding: 36rpx 32rpx;
+  padding: 36rpx 32rpx 0;
   .cancel-btns {
     flex-shrink: 0;
     display: flex;
diff --git a/src/static/image/chatList/groupAllMember.png b/src/static/image/chatList/groupAllMember.png
new file mode 100644
index 0000000000000000000000000000000000000000..3be1d16a09f0eb2de034e50346ccdf4311635f82
GIT binary patch
literal 3118
zcmV+}4AJw6P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px==t)FDRCwCmoLf*+=^en?w!1UizIGov-G_GCeQ2M2+8LkPC#TcCZO6LZF6eS~
z!MGrVn|5W_g+LM#APFjpx?WmqMR!GX*}7hk1VZjtkZ=bjf+#4UT;%KjJIP7T$vKJV
zoSX#koB2-|IKbhT-}nE2w?j%wl3S6+@#_+;`@=G=r?OP*ZY|Y%d?i|sA7TzZzf!Dm
zui%g2)nBY}`J@_Gt5oZ%EUI^Wh`%@Gb!){9j(5wn-qcc^x4BH`9ReVTj1nT;L=@xD
zkl{j7N)$Da;lwdi*x+m~thc8YsO-Polu(Kkj-LUL9pyUjr7~UbB7i|uFr^eQAwWSm
z(%5iNVJIB<b+Mqq(Na+F`dfB|`KOx#Oj)Bhzr4{qhM|yAs*8lf(Hu=QI8L+=0PU-%
zM4e-7UxO{bKsEmMh69s*)chtuDFI_1QNi#rhqYU2qL~v0QxFP!AnNQ7KdZAzv$M@_
zZU{L08$9oq>v|mk2bD*{iD6EONaj%C<m0FdM!nrGQQ6;LH!$0`U-<F<#@@>E#@<y{
zI2ej95{@ShbAo`Pm=gjM46q2t>fU<WSNL9&T$z0DLYL|w!E7jV!f=S#3n5WkZ{@4a
zzerk_0&^y#!eN->UJrA^fYiaLvrbA>ro?tRDA^xCzM0<)=7ix`iI4<hUZS>qkPtYK
zYb0RKOYY`~n{)QDnN!cfoG=_B_Nc8d^VF6+apCB^X#i*~ndTJ6Z4N6Ov`1w@0BB88
zYfTdc&H=6W&j4pxbaOPxHpdbORUq<ImgQWPd0Sj?q({8(LARQV2B$0@b2R+TDTvb?
z3Y=h==W^t>_k@p*bzWP{ZnYWAQ8COR;SiBqYw6iuap5ig<-D;^9ltrzCZAm4I1*(}
z5KbUItu?9nmGj2lKTwmh(4148WOMdL!l3|)28RHoGOy(*j9a-)AuhlaLf7jQGv`Qo
z!x6z8wS^m;fI(<?t;xx0N<u7GuyidxIY+2D`yxwuqRk1yApj{&C`W0Q#Dr6zGQ15?
zrdiG51jo(GoMNpLooX9FU9K7QX!Zpn8~)hfdW23~9Y%#32WN960?eTTf|$k(qT8bl
z+Y_%juYz;p>Ij;fUq-KLv(J`M)3<{OHD`Ai5Ljenx2U4R^A^mt#)X>02Tq%Q67g-9
z?o1@o9Ecu(1EJ^{{bR+gpD+NG>U#fPE(lI^b3Q-jMT&F%=*ttmAvo>bek8QD+@1)T
zbFkTss!oI9haH^F$)%c88);5YIOIJ$nByLuw@nOlinT6u@#X{?d$>q9;P!o_`R@RV
zr@ef+hGb`Y(b@J9+ULio7SP38<495$hdI<x7~AN%r@{ITEPyTXheJ=wUo`hJz>uxS
z`xp&Q%%galb6^(Tu}!glZPdSj%8odMn*))pFrq9)&(bGV9q&+<GQ4^5nsX4k)5FIv
zXg54Fw}f1SbEw-rgN|PrMq;#=Yime;t`FUHOe0(W6EyXN{yY6M&rxxsor5`SZ~}mW
zkwaMs^Ind}9Gr7ZU<lcsLUqDGsN<aLU6V+xcK*gFE$8Si`Dhi<+&3f09BO3Ajh6#-
z5PAd3`%FC5s`6A{=;oGJULwWWdyGM#!#67$Al$|13E6_aJn1HWH`xvxbJESJ<z`M+
zIA)-<|0qSO^K6O799*qh?>-3K*e%Nx>j=4T<f&+YoP)Eh)vCQ`l2Y-;IKqiACluXa
zk$y`GKuH(A>lqm5;2cA?#+E^r>4Sqvu3|Nt?+FbM*`3rE!X|gQr+JwZ2`3XGL*AX9
zQlj(7gqlMR0(&U=r|RoI*2(8>>y&7KZkYY7rTk#CD|C%#cvi4E7*3{~2pLY$Ekey9
z0d+bag>DSbt=MMfcwQw|JNoSaYbkHOIvBd9!#*Y0oFE*Oq3CW&0WdbM=18MVAI`Op
zg>LNL*fRzkJS&%K9ccdfO5AXsEv%ru^;Xt#&b_g4o;%St7>_x)d*N3L?qb92=D0cU
zK$PfQXnryL$6tY@O@%`)SzNh$KW;$ZbWE_qX}L2Vx@H01h|d}<j8Ss7vWGLAKy(d*
zLGC9)&7oGSfB$ccG2(5!G=RzuyF%+ZctL(-azQYh;Ro}uLuv_uDb(7KrllXM+7sG!
zXWED3GA9TJ$4p9z#<L{UoXB0zJGN=YAGHeer*@-1v|RDeCKqk(hijX9{G6CZkZ`Vb
zJs^H|WcvXU_->&&hYkm&*K|F{Ip{eTbBfr^i8!Zo_|hO+e6h;<2Od1`4z1@@G<!I$
z1(6M3iwAzW!NgqN<Y2uHcdf>6`nivDV#5gl0w^<lcOW9iIps&(F~>P$Fp0$Zs8C}k
z-uY*X{F60K@YlN`w`r`fGipX7{`nXK$tS2#XBCojsBlm^?qblrhT}2k;4u$lk~$3&
zNZhS-EdwEQl>h1@CX(^CY3QEH^Swl3-ha%28ZO==pg(@PM7s`m<IkI&Ld_xKlNw0U
zQmxy;*_?=+bD+shgM+)*g&)S@I{G3zUcXsgT@!5_gx7^me>Y59)5%qt(0^`@q8Cf6
zG)P5_)~M!W#(<MvW59qcxQn$2%{iW-Ia;2mI^D}yV815fES}odVA<os%`rx`syOLF
zvy}YifbPcG968k<0#HkeRO6QMH3!3KZViu&@w--YrjM~bbL!eK@rNX;;h(L$+|L;2
zRGf6uOloTN@iZq8yQ&Sc6lsGiov%4KCZ@tGhqzniN0?LjwU@U1kf?^cby<@=Sjxjm
z`Rw=MH*jKlfu}h^Kr%ymid1de!tZpK0~X@%(GqfG&cWdue~OaT?7qj0YL!!Kg!~vT
z3WrX+nC8gY%^~36sD$N?3Rn~ZKr^gxqMS!=?F_H~;FZG2O}&$C!zkGeFLgv#t1J5O
z^y6~J7-w^WfM)PwBC)6lKrVBIgTw9%5A8J<eGEXp@n=Z~WCM#LOS$5_H}rLD{|t9?
zs`dEwa`>Q>)}6-{4o<{W0AHN&gm*mQ_0TC#LKAbW(jO@4;c8WK)E4@B-{>4Sb1)o;
zoz;f$IYtR=`v8>H!YDZ>@}vb7kW}ZOohZfoQ|r}^Umc*8a!I|31}L2|5R8OF0y5CI
zeQ*On*I#8088=K1iC;Q0IUh2I-0{R)G3(WC+5C)BK6pRyX0{q8IG96rFMS(hXLX;(
zwS&(YokJ(R#M~<KAi@3V#dQPZn|R6?=j?`RR@!9aXb$dLdXy&X+`)Qy0icX>J;}be
zj&2Tlh#+!Kl+5ObvYyFfoI}kyB%Gbqo$QAfaD&x93BS`_R>nz-1re521uw@gF2@+>
zyxJVXo@%`$<^d{r-fB9gIcj!u$hc#BxNd;HH$9-kk-rL#fd&V{zdhCgD$*h$=18KR
zC=Kpisf3-hh_dTRt5&QdWH~=`2zzQe_i%a+3?MnV<{UOSR6w~5IHss@c1JF-E2F_N
z(%@wBhGSsDk?F0RpDW8(Tep5zZ(oai?kei(t_@;NhEQ{=^=oNW`mMaqN&^&iJm#>&
zF>gR~I`ODk&HJSNb}0K`jFGE3dp4mtP|~qIM*P@?pyxFt4X)n+n7P-*9C|q?;5^<X
z>-tq(PyE1>!`lGJa>C6~Cf%InoihD4QJxu-)LGNuB<Wfr%*hdGPDWhjbgn^sB<fR#
zd9{{&3~9a0iM1NYH6fD~E450$HzCih=Bcfz0A^(~niK3+OAsF?^vUN>)#kqdsAqi5
z*&UZTT_Tv%IsdWD@Ta6aJD;nz{0_iaHj6p%YWYW1$M2K=4^7~4#;*XzYIHaz9%pon
zvG=ZoCFE7;Qk8<oIilDk@7V%S^c$~Q>GdDsZJQ0!-T)}6IZD%zAamp*np4v`lv;H+
z72ngw`#(bPKYMZ%rVIcwB!)Q|eBjg=h5$}R)YZTZ2ddVTmaQ~h1vtwI%Q-cMWxT)+
zlg+eE0frTp(){x*Wp^%sYROU>{UVq%xvRSC;x3s!m$5bTI<yR#;kQ}x?!RU!x=J!@
zjK{&6n*hj}spy&jYZiks0dSlUH^GwQU`a_jd=LKKWZ&=q0iXX?($1Y%ZvX%Q07*qo
IM6N<$f};2UN&o-=

literal 0
HcmV?d00001

diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index 43af858..4a09fef 100644
--- a/src/store/auth/index.js
+++ b/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('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894c272b29107599e31eb0d0e227acbe3e643ffc54df2c2270430888e9f045332e4b933a9d130e41942cc8253f55a0bd20040c89278356b3901db966e868d87104beab11987eba560d658eeb9a9821c264')
+  const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b89f92989eae7bf9c76b792b7ec454cebd8934fb97b8b0b30dbda0bc80ded1b8a5eea1920d39a9f892139704a56c7d95e3dc7ae833b91336100781e0e75e267fff794e16f7d1e8e752be010f8ab8911a942')
   const refreshToken = useStorage('refreshToken', '', uniStorage)
   const userInfo = useStorage('userInfo', {}, uniStorage)
   const leaderList = useStorage('leaderList', [], uniStorage)

From 4b3062eefaf0f4597aed69743de668b9c53d4f2e Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Wed, 12 Mar 2025 16:26:39 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=89=BE=E7=89=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/selectMemberByAlphabet.vue     | 87 +++++++++++++++++--
 1 file changed, 78 insertions(+), 9 deletions(-)

diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
index f835497..891e402 100644
--- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@@ -24,7 +24,12 @@
             padding: props?.manageType === 'searchRecord' ? '20rpx 0 0' : '',
           }"
         >
-          <div class="member-list-alphabet-anchor-point">
+          <div
+            class="member-list-alphabet-anchor-point"
+            :style="{
+              top: props?.manageType === 'mention' ? '90rpx' : '',
+            }"
+          >
             <div
               class="member-list-alphabet-anchor-point-each"
               v-for="(alphabetItem, alphabetIndex) in state?.alphabet"
@@ -55,11 +60,12 @@
               :style="{
                 padding:
                   props?.manageType === 'searchRecord' ||
-                  props?.manageType === 'removeMembers'
+                  props?.manageType === 'removeMembers' ||
+                  props?.manageType === 'mention'
                     ? '10rpx 30rpx'
                     : '',
               }"
-              v-if="alphabetItem?.memberList?.length > 0"
+              v-if="alphabetItem?.memberList?.length > 0 && alphabetItem?.key !== '0'"
               :id="alphabetItem.key"
               :ref="
                 (el) => {
@@ -85,7 +91,8 @@
                     :manageType="props?.manageType"
                     :itemStyle="
                       props?.manageType === 'searchRecord' ||
-                      props?.manageType === 'removeMembers'
+                      props?.manageType === 'removeMembers' ||
+                      props?.manageType === 'mention'
                         ? 'list'
                         : 'card'
                     "
@@ -108,7 +115,7 @@
                           !(
                             props?.manageType === 'removeMembers' &&
                             item?.is_mine
-                          )
+                          ) && props?.isMulSelect
                         "
                         :round="10"
                         :color="
@@ -166,7 +173,7 @@ import {
 } from '@/api/group/index.js'
 import { useDialogueStore, useGroupStore, useGroupTypeStore } from '@/store'
 
-const emits = defineEmits(['updateSelectedMembersNum'])
+const emits = defineEmits(['updateSelectedMembersNum', 'getSelectResult'])
 
 const zPaging = ref()
 useZPaging(zPaging)
@@ -210,6 +217,11 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  isMulSelect: {
+    //是否开启多选
+    type: Boolean,
+    default: true,
+  },
 })
 
 const state = reactive({
@@ -237,6 +249,37 @@ watch(
   { deep: true },
 )
 
+watch(
+  () => props?.isMulSelect,
+  (newIsMulSelect) => {
+    if (props?.manageType === 'mention') {
+      if (!newIsMulSelect) {
+        state.resultMemberList.unshift({
+          key: '0',
+          memberList: [
+            {
+              avatar: '/src/static/image/chatList/groupAllMember.png',
+              erp_user_id: 0,
+              gender: 0,
+              is_mute: 0,
+              key: '0',
+              leader: 0,
+              nickname: '所有人',
+              remark: '',
+              user_id: 0,
+            },
+          ],
+        })
+      } else {
+        if (state.resultMemberList[0].key === '0') {
+          state.resultMemberList.splice(0, 1)
+        }
+      }
+    }
+  },
+  { deep: true, immediate: true },
+)
+
 //获取A-Z tag元素
 const alphabetElementRefs = ref([])
 //观察者
@@ -321,7 +364,8 @@ const handleClickItem = (item) => {
     (props?.manageType === 'silence' && item.is_mute === 1) ||
     (props?.manageType === 'admin' &&
       (item.leader === 1 || item.leader === 2)) ||
-    (props?.manageType === 'removeMembers' && item.is_mine)
+    (props?.manageType === 'removeMembers' && item.is_mine) ||
+    (props?.manageType === 'mention' && !props?.isMulSelect)
   ) {
     return
   }
@@ -350,7 +394,8 @@ const handleClickItem = (item) => {
 const assembleAlphabetMemberList = async (newMemberList) => {
   if (
     props?.manageType === 'searchRecord' ||
-    props?.manageType === 'removeMembers'
+    props?.manageType === 'removeMembers' ||
+    props?.manageType === 'mention'
   ) {
     const resultMemberList = ref([])
     const alphabet = Array.from({ length: 26 }, (_, i) =>
@@ -368,6 +413,24 @@ const assembleAlphabetMemberList = async (newMemberList) => {
       })
     })
     state.alphabet = tempAlphabet
+    if (props?.manageType === 'mention' && !props?.isMulSelect) {
+      resultMemberList.value.unshift({
+        key: '0',
+        memberList: [
+          {
+            avatar: '/src/static/image/chatList/groupAllMember.png',
+            erp_user_id: 0,
+            gender: 0,
+            is_mute: 0,
+            key: '0',
+            leader: 0,
+            nickname: '所有人',
+            remark: '',
+            user_id: 0,
+          },
+        ],
+      })
+    }
     state.resultMemberList = resultMemberList
   } else {
     if (
@@ -468,8 +531,10 @@ const scrollToView = (alphabet) => {
   console.log()
   zPaging.value?.scrollIntoViewById(
     alphabet,
-    document.getElementById('topArea').clientHeight
+    document.getElementById('topArea')?.clientHeight
       ? document.getElementById('topArea').clientHeight - 1
+      : props?.manageType === 'mention'
+      ? 140
       : 80,
   )
 }
@@ -499,6 +564,7 @@ const confirmSelectMembers = () => {
   let selectedUserIds = ''
   let itemList = dialogueParams.memberList
   let positionInfos = []
+  let selectUserInfos = []
   if (
     props?.manageType === 'admin' &&
     (groupParams.groupInfo.group_type == 2 ||
@@ -514,6 +580,7 @@ const confirmSelectMembers = () => {
       } else {
         selectedUserIds += ',' + ele.checkArr[0]
       }
+      selectUserInfos.push(ele)
     }
     if (
       ele.checkArr?.length > 0 ||
@@ -613,6 +680,8 @@ const confirmSelectMembers = () => {
         }
       })
       resp.catch(() => {})
+    } else if (props?.manageType === 'mention') {
+      emits('getSelectResult', selectUserInfos)
     }
   }
 }

From adb57bda8859dd627b26a2d67d4f87727e9e66a7 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Wed, 12 Mar 2025 19:59:54 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=89=BE=E7=89=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/avatar-module/index.vue        |  2 +-
 .../components/selectMemberByAlphabet.vue     | 14 ++++++-
 src/pages/dialog/index.vue                    | 37 +++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/components/avatar-module/index.vue b/src/components/avatar-module/index.vue
index 86321b4..aa5901b 100644
--- a/src/components/avatar-module/index.vue
+++ b/src/components/avatar-module/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="avatar-module" :style="customStyle">
+  <div class="avatar-module" :style="[customStyle, { background: avatar ? '#fff' : '' }]">
     <img :src="avatar" v-if="avatar" />
     <span v-else :style="customTextStyle">{{ text_avatar }}</span>
   </div>
diff --git a/src/pages/chatSettings/components/selectMemberByAlphabet.vue b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
index 891e402..faf7093 100644
--- a/src/pages/chatSettings/components/selectMemberByAlphabet.vue
+++ b/src/pages/chatSettings/components/selectMemberByAlphabet.vue
@@ -65,7 +65,10 @@
                     ? '10rpx 30rpx'
                     : '',
               }"
-              v-if="alphabetItem?.memberList?.length > 0 && alphabetItem?.key !== '0'"
+              v-if="
+                alphabetItem?.memberList?.length > 0 &&
+                alphabetItem?.key !== '0'
+              "
               :id="alphabetItem.key"
               :ref="
                 (el) => {
@@ -173,7 +176,11 @@ import {
 } from '@/api/group/index.js'
 import { useDialogueStore, useGroupStore, useGroupTypeStore } from '@/store'
 
-const emits = defineEmits(['updateSelectedMembersNum', 'getSelectResult'])
+const emits = defineEmits([
+  'updateSelectedMembersNum',
+  'getSelectResult',
+  'getMentionSelectLists',
+])
 
 const zPaging = ref()
 useZPaging(zPaging)
@@ -367,6 +374,9 @@ const handleClickItem = (item) => {
     (props?.manageType === 'removeMembers' && item.is_mine) ||
     (props?.manageType === 'mention' && !props?.isMulSelect)
   ) {
+    if (props?.manageType === 'mention' && !props?.isMulSelect) {
+      emits('getMentionSelectLists', [item])
+    }
     return
   }
   let itemList = dialogueParams.memberList
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index f4d5242..dc1ebdb 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -111,7 +111,6 @@
                 <span
                   class="nickname pointer"
                   v-show="talkParams.type == 2 && item.float == 'left'"
-                  @click="onClickNickname(item)"
                 >
                   <span class="at">@</span>
                   {{ item.nickname }}
@@ -344,7 +343,7 @@
     </ZPaging>
     <tm-drawer
       placement="bottom"
-      :show="state.isShowMentionSelect"
+      v-model:show="state.isShowMentionSelect"
       :hideHeader="true"
       :round="5"
       :height="state.mentionSelectHeight"
@@ -428,6 +427,7 @@
         @updateSelectedMembersNum="updateSelectedMembersNum"
         :isMulSelect="state.mentionIsMulSelect"
         @getSelectResult="getSelectResult"
+        @getMentionSelectLists="getMentionSelectLists"
       ></selectMemberByAlphabet>
     </tm-drawer>
   </div>
@@ -530,7 +530,7 @@ const state = ref({
   selectedMembersNum: 0, //选中的要提醒的人数
   mentionSelectHeight: 0, //选择要提醒人的区域高度
   selectAreaHeight: 0, //选择要提醒人的可选人员列表区域高度
-  isShowMentionSelect: true, //是否显示要提醒人的选择区域
+  isShowMentionSelect: false, //是否显示要提醒人的选择区域
 })
 
 uniOnload((options) => {
@@ -733,6 +733,14 @@ const onEditorChange = () => {
 
   let text = deltaToString(delta)
 
+  if (
+    text.length > 0 &&
+    text.slice(-2).trim() === '@' &&
+    talkParams.type === 2
+  ) {
+    state.value.isShowMentionSelect = true
+  }
+
   if (!isEmptyDelta(delta)) {
     editorDraftStore.items[indexName.value || ''] = JSON.stringify({
       text: text,
@@ -1072,6 +1080,29 @@ const confirmMentionSelect = () => {
 //获取选择的结果
 const getSelectResult = (mentionSelect) => {
   console.log(mentionSelect)
+  getMentionSelectLists(mentionSelect)
+}
+
+//处理要提醒人的消息样式
+const getMentionSelectLists = (mentionSelectList) => {
+  console.log(mentionSelectList)
+  let mentionUserIds = []
+  let mentionUsers = getQuill().getContents().ops //先读出来之前的信息内容
+  mentionUsers[0].insert =
+    mentionUsers[0].insert.slice(0, -2) + mentionUsers[0].insert.slice(-1)
+  console.log(mentionUsers[0].insert)
+  mentionSelectList.forEach((mentionSelectItem) => {
+    mentionUserIds.push(mentionSelectItem.erp_user_id)
+    mentionUserIds.push(mentionSelectItem.id)
+    mentionUsers.push({
+      insert: '@' + mentionSelectItem.nickname + ' ',
+      attributes: {
+        color: '#1890ff',
+      },
+    })
+  })
+  getQuill().setContents(mentionUsers)
+  hideMentionSelect()
 }
 
 onMounted(async () => {