删除公告，消息撤回优化

2022-02-24 10:56:16 +08:00
parent 8b7a259c00
commit e72d6b3a91
8 changed files with 87 additions and 80 deletions
--- a/pages/im/components/show/showText.vue
+++ b/pages/im/components/show/showText.vue
@@ -57,11 +57,7 @@
        .text {
            box-sizing: border-box;
            max-width: 502rpx;
-<<<<<<< HEAD
-            padding:10rpx 30rpx;
-=======
            padding: 20rpx 24rpx;
->>>>>>> 32e3e0ef3040a5320c18aa4803fc5bf1476deb06
            line-height: 46rpx;
            font-size: 32rpx;
            color: $text-color;