Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

resources/views/web/prints.blade.php

@@ -31,7 +31,7 @@
     $(function(){
         $(".print").width($(".edit-con").width());
         if($(".edit-con").height()==280){
-            $(".edit-con").css({"height":"301px"})
+            $(".print").css({"height":"301px"})
         }
         $(".huabuitem[type='6'],.huabuitem[type='7']").each(function(){
             var urlo_=$(this).css("backgroundImage").replace('url(','').replace(')','');