调整聊天窗口

pages/im/group/chat.vue

@@ -99,15 +99,10 @@
                 url: '/pages/im/group/info?targetId=' + this.targetId
             })
         },
-<<<<<<< HEAD:pages/im/group/chat.nvue
         methods: {
             onScroll(e){
                 this.$refs.messageBar.onHidePopus()
             },
-=======
-        methods: {
-            // 转到好友资料页面
->>>>>>> 6c0feb9cb60e7c756df3bbe34e36fbe467b90d27:pages/im/group/chat.vue
             toUser(item) {
                 if (item.senderUserId == '__system__') {
                     return
@@ -176,12 +171,10 @@
         background: $window-color;
         height: 100vh;
         display: flex;
-        flex-direction: column;
-
+        flex-direction: column;
+        overflow: scroll;
         .body {
-            overflow: scroll;
             flex: 1;
-
             .cell {
                 padding: 10rpx 30rpx;