...

pages/im/components/groupUserList.vue

@@ -61,8 +61,13 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
+<<<<<<< HEAD
                 avatarSize: 45,
                 labelSize: 14,
+=======
+                avatarSize: 84,
+                labelSize: 14,
+>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
                 iconSize: 14
             }
         },
@@ -73,10 +78,17 @@
                 }
             }
         },
+<<<<<<< HEAD
         created() {
             this.avatarSize = utils.rpx2px(90)
             this.labelSize = utils.rpx2px(24)
             this.iconSize = utils.rpx2px(26)
+=======
+        created() {
+            this.avatarSize = utils.rpx2px(84)
+            this.labelSize = utils.rpx2px(24)
+            this.iconSize = utils.rpx2px(26)
+>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
         },
         mounted() {
             this.initGroupInfo()
@@ -273,8 +285,8 @@
             .avatar {
                 border-radius: 0 8rpx 0 0;
                 position: relative;
-                width: 90rpx;
-                height: 90rpx;
+                width: 84rpx;
+                height: 84rpx;
                 overflow: hidden;
 
                 .admin {