merge

pages/im/components/groupUserList.vue

@@ -61,14 +61,8 @@
                 actionMap: [],
                 actionTitle: '',
                 currentUser: {},
-<<<<<<< HEAD
                 avatarSize: 45,
                 labelSize: 14,
-=======
-                avatarSize: 84,
-                labelSize: 14,
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
-                iconSize: 14
             }
         },
         computed: {
@@ -78,17 +72,10 @@
                 }
             }
         },
-<<<<<<< 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()

pages/im/group/reviewed.vue

@@ -138,7 +138,6 @@
         }
 
     }
-<<<<<<< HEAD
 
     .no-lists {
         padding-top: $padding * 5;
@@ -154,6 +153,4 @@
             padding-top: $padding;
         }
     }
-=======
->>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
 </style>