Commit 5d5ff803 by 孙龙

Merge branch 'feature/sl/20230217' of http://119.23.72.7/sunlong_v5/note-library…

Merge branch 'feature/sl/20230217' of http://119.23.72.7/sunlong_v5/note-library into feature/sl/20230217

# Conflicts:
#	storage/offline_print/1000.txt
parents 0effb36d 41c075e6
APP_ENV=production
APP_DEBUG=true
APP_DEBUG=false
DING_ALERT=true
APP_KEY=fasyzIUunp4HcLBudUmkMnDc5H4Z4rNW
......
<IfModule mod_rewrite.c>
<IfModule mod_negotiation.c>
Options -MultiViews
</IfModule>
RewriteEngine On
# Redirect Trailing Slashes If Not A Folder...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [L,R=301]
# Handle Front Controller...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
</IfModule>
<IfModule deflate_module>
# 对js,html,xml,css,普通文本开启Gzip压缩
AddOutputFilterByType DEFLATE application/x-javascript text/html text/plain text/xml text/css
</IfModule>
File mode changed
......@@ -3,7 +3,7 @@
<style>
body{background:#fff;margin:0px;}
.print{background:#fff;padding-left:8px;}
.print{background:#fff;padding-left:8px; page-break-after: always; }
.edit-con{box-sizing:border-box;top:6px;}
.layui-btn{
......
......@@ -3,7 +3,7 @@
<style>
body{background:#fff;margin:0px;}
.print{background:#fff;padding-left:8px;}
.print{background:#fff;padding-left:8px; page-break-after: always; }
.edit-con{box-sizing:border-box;top:6px;}
.layui-btn{
......@@ -29,6 +29,7 @@
@endforeach
<script src="../../../../js/jquery-2.2.1.js"></script>
<script type="text/javascript">
$(function(){
$(".print").width($(".edit-con").width());
if($(".edit-con").height()==280){
......
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment