merge

2022-02-21 18:10:42 +08:00
parent 7220c3466d
commit 914f3f9371
2 changed files with 0 additions and 16 deletions
--- a/pages/im/components/groupUserList.vue
+++ b/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()