From 12e89108214b3985e3055e58bedd4a69a56fe66d Mon Sep 17 00:00:00 2001
From: DCloud_JSON <linju@dcloud.io>
Date: Fri, 21 Jun 2024 13:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=93=8D=E4=BD=9C=E8=8F=9C=E5=8D=95=E7=9A=84=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-im-msg-list/uni-im-msg-list.vue       | 11 ++-
 pages/chat/chat.vue                           | 71 ++++++++++---------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/components/uni-im-msg-list/uni-im-msg-list.vue b/components/uni-im-msg-list/uni-im-msg-list.vue
index e00781a..a3bc9da 100644
--- a/components/uni-im-msg-list/uni-im-msg-list.vue
+++ b/components/uni-im-msg-list/uni-im-msg-list.vue
@@ -11,7 +11,7 @@
               :contentText='{"contentrefresh": "正在加载历史消息","contentnomore": "没有更多历史消息"}'></uni-im-load-state>
          </view>
          <view :class="['item',msg.type]" :id="'item-'+index" @click="clickItem">
-           <label class="msg-box" :class="{'active-msg':msg._id === activeMsgId || msg.unique_id === activeMsgId}" @click="checkMsg(msg)">
+           <view class="msg-box" :class="{'active-msg':msg._id === activeMsgId || msg.unique_id === activeMsgId,'pointer':chooseMore}" @click="checkMsg(msg)">
              <template v-if="chooseMore">
               <checkbox :checked="checkedMsgList.find(i=>i._id == msg._id) != undefined" class="checkbox" />
               <view class="mask"></view>
@@ -24,7 +24,7 @@
              @viewMsg="viewMsg" :ref="'uni-im-msg'" class="uni-im-msg"
              >
              </uni-im-msg>
-           </label>
+           </view>
          </view>
        </view>
      </template>
@@ -82,7 +82,7 @@
     components: {
       uniImList
     },
-    emits:['checkedMsgList','longpressMsgAvatar','showControl','clickItem','retriesSendMsg','putChatInputContent'],
+    emits:['checkedMsgList','update:checkedMsgList','longpressMsgAvatar','showControl','clickItem','retriesSendMsg','putChatInputContent'],
     computed: {
       ...uniIm.mapState(['systemInfo', 'isWidescreen']),
       loadState() {
@@ -693,5 +693,10 @@
     cursor: pointer;
     /* #endif */
   }
+  /* #ifdef H5 */
+  .pointer {
+    cursor: pointer;
+  }
+  /* #endif */
 }
 </style>
\ No newline at end of file
diff --git a/pages/chat/chat.vue b/pages/chat/chat.vue
index 4d4dea3..e321ba8 100644
--- a/pages/chat/chat.vue
+++ b/pages/chat/chat.vue
@@ -39,6 +39,40 @@
           </view>
         </template>
       </uni-im-chat-input>
+      
+      <view v-if="chooseMoreMsg" class="toolbar">
+        <view class="item" @click="shareMsg(checkedMsgList)">
+          <view class="icons-box">
+            <uni-icons size="35" type="redo"></uni-icons>
+          </view>
+          <text class="title">逐条转发</text>
+        </view>
+        <view class="item" @click="shareMsg(checkedMsgList,true)">
+          <view class="icons-box">
+            <uni-icons size="35" type="paperplane"></uni-icons>
+          </view>
+          <text class="title">合并转发</text>
+        </view>
+        <view class="item" @click="toolBarNext">
+          <view class="icons-box">
+            <uni-icons size="35" type="folder-add"></uni-icons>
+          </view>
+          <text class="title">收藏</text>
+        </view>
+        <view class="item" @click="toolBarNext">
+          <view class="icons-box">
+            <uni-icons size="35" type="download"></uni-icons>
+          </view>
+          <text class="title">保存至电脑</text>
+        </view>
+        <view class="item" @click="toolBarNext">
+          <view class="icons-box">
+            <uni-icons size="35" type="trash"></uni-icons>
+          </view>
+          <text class="title">删除</text>
+        </view>
+        <uni-icons @click="chooseMoreMsg = false" color="#999" size="35" type="closeempty"></uni-icons>
+      </view>
     </view>
 
     <msg-popup-control ref="msg-popup-control" @answer="setAnswerMsg" @share="shareMsg" @chooseMore="chooseMoreMsg = true;checkedMsgList = $event"></msg-popup-control>
@@ -81,40 +115,6 @@
       chooseMoreMsg:{{chooseMoreMsg}}
       checkedMsgList:{{checkedMsgList}} -->
 		</view>
-    
-    <view v-if="chooseMoreMsg" class="toolbar" @click="chooseMoreMsg = false">
-      <view class="item" @click="shareMsg(checkedMsgList)">
-        <view class="icons-box">
-          <uni-icons size="35" type="redo"></uni-icons>
-        </view>
-        <text class="title">逐条转发</text>
-      </view>
-      <view class="item" @click="shareMsg(checkedMsgList,true)">
-        <view class="icons-box">
-          <uni-icons size="35" type="paperplane"></uni-icons>
-        </view>
-        <text class="title">合并转发</text>
-      </view>
-      <view class="item" @click="toolBarNext">
-        <view class="icons-box">
-          <uni-icons size="35" type="folder-add"></uni-icons>
-        </view>
-        <text class="title">收藏</text>
-      </view>
-      <view class="item" @click="toolBarNext">
-        <view class="icons-box">
-          <uni-icons size="35" type="download"></uni-icons>
-        </view>
-        <text class="title">保存至电脑</text>
-      </view>
-      <view class="item" @click="toolBarNext">
-        <view class="icons-box">
-          <uni-icons size="35" type="trash"></uni-icons>
-        </view>
-        <text class="title">删除</text>
-      </view>
-      <uni-icons @click="chooseMoreMsg = false" color="#999" size="35" type="closeempty"></uni-icons>
-    </view>
   </view>
 </template>
 
@@ -1016,6 +1016,7 @@
       },
       shareMsg(msgList,merge = false) {
         this.$refs['share-msg'].open(msgList,merge)
+        this.chooseMoreMsg = false
       },
       toolBarNext(){
         uni.showToast({
@@ -1264,7 +1265,7 @@ page {
     bottom: 0;
     left: 0;
     width: 100%;
-    height: 260px;
+    height: 100%;
     background-color: #ededed;
     border-top: solid 1px #ededed;
     flex-direction: row;
-- 
GitLab