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

resources/views/web/prints.blade.php

@@ -3,8 +3,9 @@
  
 <style>
     body{background:#fff;margin:0px;}
-    .print{padding-top:20px;padding-left:15px;background:#fff;}
-    .edit-con{box-sizing:border-box;}
+    .print{background:#fff;padding-left:8px;}
+    .edit-con{box-sizing:border-box;top:6px;}
+    
     .layui-btn{
         display: inline-block;
     height: 38px;
@@ -31,7 +32,7 @@
     $(function(){
         $(".print").width($(".edit-con").width());
         if($(".edit-con").height()==280){
-            $(".print").css({"height":"301px"})
+            $(".print").css({"height":"303px"})
         }
         $(".huabuitem[type='5'],.huabuitem[type='6'],.huabuitem[type='7']").each(function(){
             var urlo_=$(this).css("backgroundImage").replace('url(','').replace(')','');