TmOct5/ZhHealth
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

merge

Browse Source
This commit is contained in:
Jason.Chen
2022-02-21 18:10:42 +08:00
parent 7220c3466d
commit 914f3f9371
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pages/im/components/groupUserList.vue
View File

@@ -61,14 +61,8 @@
actionMap: [], actionMap: [],
actionTitle: '', actionTitle: '',
currentUser: {}, currentUser: {},
<<<<<<< HEAD
avatarSize: 45, avatarSize: 45,
labelSize: 14, labelSize: 14,
=======
avatarSize: 84,
labelSize: 14,
>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
iconSize: 14
} }
}, },
computed: { computed: {
@@ -78,17 +72,10 @@
} }
} }
}, },
<<<<<<< HEAD
created() {
this.avatarSize = utils.rpx2px(90)
this.labelSize = utils.rpx2px(24)
this.iconSize = utils.rpx2px(26)
=======
created() { created() {
this.avatarSize = utils.rpx2px(84) this.avatarSize = utils.rpx2px(84)
this.labelSize = utils.rpx2px(24) this.labelSize = utils.rpx2px(24)
this.iconSize = utils.rpx2px(26) this.iconSize = utils.rpx2px(26)
>>>>>>> d8b90f97d110aed79b35d385dbc0eeb481ef4eab
}, },
mounted() { mounted() {
this.initGroupInfo() this.initGroupInfo()

3
pages/im/group/reviewed.vue
View File

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