From 405270dc5187288da33ead7f93cb25179bde3834 Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Sat, 11 Aug 2018 18:47:57 +0800
Subject: [PATCH] v1.2

---
 README.md                       | 9 +++++++++
 functions/class/class.admin.php | 2 +-
 functions/version.txt           | 2 +-
 static/embed.js                 | 7 +++++++
 tpl/admin/footer.php            | 2 +-
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 709bb1a..7f7fb61 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,16 @@ ImgURL是一款简单、纯粹的图床程序，使用PHP + SQLite 3开发，不
 - [ ] 图片水印
 - [ ] API上传
 
+
 ### 更新日志
+#### v1.2 - 2018.08.11
+* 增加URL批量上传
+* 去掉一些不必要的菜单
+* 优化CSS样式
+* 优化图片查看器
+* 修复一些BUG
+
+
 #### v1.1 - 2018.05.04
 * 可上传至SM.MS图床
 * 优化IP获取，及其它细节优化
diff --git a/functions/class/class.admin.php b/functions/class/class.admin.php
index 8b5a20c..37d889a 100644
--- a/functions/class/class.admin.php
+++ b/functions/class/class.admin.php
@@ -71,7 +71,7 @@
                     break;
                 case 'unidentification':
                  	$datas = $database->select("imginfo", "*", [
-                        "level" => '',
+                        "level" => null,
                         "ORDER" => ["id" => "DESC"],
                         "LIMIT" => [$start,$num]
                     ]);
diff --git a/functions/version.txt b/functions/version.txt
index dcc7c95..4435ba7 100644
--- a/functions/version.txt
+++ b/functions/version.txt
@@ -1 +1 @@
-v1.12(20180810)
\ No newline at end of file
+v1.20(20180811)
\ No newline at end of file
diff --git a/static/embed.js b/static/embed.js
index b6ea7e0..aa9ac4c 100644
--- a/static/embed.js
+++ b/static/embed.js
@@ -322,7 +322,14 @@ function cdubious(id){
 //图片压缩功能
 function compress(id){
     //layer.msg('该功能还在开发中！', {time: 2000})
+    layer.open({
+	  	type:3
+	  	,content: '处理中...'
+	});
     $.get("../functions/class/class.pic.php?id=" + id,function(data,status){
+	    if(status == 'success'){
+		    layer.closeAll('loading');
+	    }
         layer.open({
             title: '温馨提示：',
             time:2000
diff --git a/tpl/admin/footer.php b/tpl/admin/footer.php
index 240d473..55f7543 100644
--- a/tpl/admin/footer.php
+++ b/tpl/admin/footer.php
@@ -13,6 +13,6 @@
 
     <script src="https://cdn.bootcss.com/jquery/2.2.4/jquery.min.js"></script>
 	<script src="../static/layui/layui.js"></script>
-	<script src="../static/embed.js?v=1.2"></script>
+	<script src="../static/embed.js?v=1.21"></script>
 </body>
 </html>
\ No newline at end of file