Merge pull request '修改了图片' (#42 ) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/42
Merge branch 'master' into xbx
2020-08-12 15:02:46 +08:00 · 2020-08-12 15:02:41 +08:00 · 2020-08-12 15:01:25 +08:00
2 changed files with 2 additions and 2 deletions
--- a/pages/messages/privateChat.vue
+++ b/pages/messages/privateChat.vue
@ -312,7 +312,7 @@
 		box-sizing: border-box;
 	}
 	.chatInterface .top{
-		font-size: 24rpx;
+		font-size: 20rpx;
 		height: 90rpx;
 		display: flex;
 		flex-direction: column;
@ -322,7 +322,7 @@
 		color: blue;
 	}
 	.chatInterface .top .description{
-		text-decoration: underline;
+		/* text-decoration: underline; */
 	}

 	.chatInterface .message-item{
--- a/static/images/jianpan.png
+++ b/static/images/jianpan.png
Author	SHA1	Message	Date
luyuan	5b2745051e	Merge pull request '修改了图片' (#42 ) from xbx into master Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/42	2020-08-12 15:02:46 +08:00
luyuan	f58cc207c4	Merge branch 'master' into xbx	2020-08-12 15:02:41 +08:00
luyuan	192bd462d4	修改了图片	2020-08-12 15:01:25 +08:00