Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/views/libraries/show.json.jbuilder

@@ -38,7 +38,7 @@ json.operation do
 
     json.can_deletable manageable
     json.can_editable manageable
-    json.user_praised PraiseTread.exists?(user_id: current_user&.id)
+    json.user_praised library.praise_treads.exists?(user_id: current_user&.id)
   else
     json.can_deletable false
     json.can_editable false

public/react/public/css/edu-all.css

@@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 831px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 831px;overflow-y: auto;overflow-x: hidden;}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}

public/stylesheets/educoder/edu-all.css

@@ -580,7 +580,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 831px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 831px;overflow-y: auto;overflow-x: hidden;}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}