From aa46a0d438b3c49ca24996054e3bb08dd620e261 Mon Sep 17 00:00:00 2001
From: DCloud_JSON <linju@dcloud.io>
Date: Thu, 20 Jun 2024 21:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/group/info.vue   | 11 ++---------
 pages/index/index.scss | 36 ++++++++++++++++++++----------------
 pages/index/index.vue  | 17 ++++++++++-------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pages/group/info.vue b/pages/group/info.vue
index 2098905..ead1066 100644
--- a/pages/group/info.vue
+++ b/pages/group/info.vue
@@ -424,16 +424,9 @@
   @import "@/uni_modules/uni-im/common/baseStyle.scss";
   page,
   .group-info-box {
-    width: 750rpx;
-    flex: 1;
+    width: 100%;
+    height: 100%;
     background-color: #f5f5f5;
-    /* #ifdef H5 */
-    @media screen and (min-device-width:960px) {
-      height: calc(95vh - 70px);
-      overflow-y: auto;
-      flex: none;
-    }
-    /* #endif */
     .logo {
       width: 50px;
       height: 50px;
diff --git a/pages/index/index.scss b/pages/index/index.scss
index 2e92390..01ee1a4 100644
--- a/pages/index/index.scss
+++ b/pages/index/index.scss
@@ -2,6 +2,7 @@
  //   flex: 1;
  // }
 page {
+  width: 100%;
   height: 100vh;
   background-color: #2e2e3e;
   /* #ifdef H5 */
@@ -128,26 +129,29 @@ page {
               }
             }
           }
-        }
-        
-        .chatInfoBox {
-          z-index: 9;
-          position: absolute;
-          right:0;
-          top: 70px;
-          background-color: rgba(0,0,0,0.2);
-          height: calc(95vh - 70px);
-          align-items: flex-end;
-          width: 100%;
-          .group-info-text {
-            max-width: 250px !important;
-            text-align: left;
-            word-break: break-all;
+          .chatInfoBox {
+            z-index: 9;
+            position: absolute;
+            right:0;
+            background-color: rgba(0,0,0,0.2);
+            height: 100%;
+            width: 100%;
+            align-items: flex-end;
+            .group-info-parent{
+              height: 100%;
+              overflow-y: auto;
+              background-color: #f5f5f5;
+            }
+            .group-info-text {
+              max-width: 250px !important;
+              text-align: left;
+              word-break: break-all;
+            }
           }
         }
       }
       #ccid-is-null-tip {
-        height: 95vh;
+        flex: 1;
         padding-top: 30vh;
         align-items: center;
         background-color: #efefef;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index fa4f8f7..b25e65f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -74,14 +74,17 @@
             <view class="header">
             	<uni-icons @click="showChatInfo" class="more" type="more-filled" size="20"></uni-icons>
             </view>
-            <chat-view class="content" ref="chat-view"></chat-view>
-					</template>
-					<view v-if="chatInfoIsShow" class="chatInfoBox" @click.stop="chatInfoIsShow = false">
-            <view @click.native.stop>
-              <uni-im-group-info v-if="currentConversation.group_id" ref="group-info"></uni-im-group-info>
-              <uni-im-chat-info v-else ref="chat-info"></uni-im-chat-info>
+            <view class="content">
+              <chat-view ref="chat-view"></chat-view>
+              <view v-if="chatInfoIsShow" class="chatInfoBox" @click.stop="chatInfoIsShow = false">
+                <view @click.stop class="group-info-parent">
+                  <uni-im-group-info v-if="currentConversation.group_id" ref="group-info"></uni-im-group-info>
+                  <uni-im-chat-info v-else ref="chat-info"></uni-im-chat-info>
+                </view>
+              </view>
             </view>
-					</view>
+					</template>
+					
 				</template>
     
 				<view v-else id="ccid-is-null-tip">
-- 
GitLab