From b4e15da30a738cb824383cc09fd6fa970d2b6a34 Mon Sep 17 00:00:00 2001
From: xiaoz <xiaoz93@outlook.com>
Date: Mon, 19 Nov 2018 13:43:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/picadmin.php    | 46 ++++++++++++++++++++++++++++++++++++++++++-
 functions/version.txt |  2 +-
 static/embed.js       | 26 +++++++++++++++++++++++-
 static/style.css      | 12 ++++++++++-
 tpl/admin/footer.php  |  2 +-
 tpl/admin/header.php  |  2 +-
 tpl/user/header.php   |  2 +-
 7 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/admin/picadmin.php b/admin/picadmin.php
index 0462ef8..3321052 100644
--- a/admin/picadmin.php
+++ b/admin/picadmin.php
@@ -63,9 +63,15 @@
                 $imgurl = $config['domain'].$img['path'];
                 $id = $img['id'];
             ?>
-            <div class="layui-col-lg4 picadmin">
+            <div id = "imgid<?php echo $id; ?>" class="layui-col-lg4 picadmin" onmouseover = "show_imgcon(<?php echo $id; ?>)" onmouseout = "hide_imgcon(<?php echo $id; ?>)">
                 <!-- <a id = "imgid<?php echo $id; ?>" href="javascript:;" onclick = "adminshow('<?php echo $imgurl ?>',<?php echo $id; ?>)"></a> -->
                 <img lay-src="<?php echo $imgurl; ?>" layer-src="<?php echo $imgurl; ?>" alt="图片ID: <?php echo $id; ?>" src = "../static/loading32.gif">
+                <!-- 删除按钮 -->
+                <div class = "imgcon" id = "imgcon<?php echo $id; ?>">
+                    <a href="javascript:;" title = "图片链接" class="layui-btn layui-btn-xs layui-btn-normal" onclick = "adminshow('<?php echo $imgurl ?>',<?php echo $id; ?>)"><i class="layui-icon">&#xe64c;</i></a>
+                    <a href="javascript:;" title = "删除这张图片" class="layui-btn layui-btn-xs layui-btn-danger" onclick="deleteimg(<?php echo $id; ?>)"><i class="layui-icon">&#xe640;</i></a>
+                </div>
+                <!-- 删除按钮END -->
             </div>
             <?php } ?>
         </div>
@@ -75,6 +81,44 @@
         <!-- 后台内容部分END -->
     </div>
 </div>
+<!--图片查看-->
+<div id="adminshow">
+	<div style = "margin-top:2em;"><center><img src="" alt=""></center></div>
+	<div id = "copy">
+		<center>
+		<table class="layui-table" lay-skin="nob">
+            <colgroup>
+                <col width="80">
+                <col width="520">
+                <col>
+            </colgroup>
+            <tbody>
+                <tr>
+                    <td>URL</td>
+                    <td><input type="text" class="layui-input" id="url" data-cip-id="url"></td>
+                    <td><a href="javascript:;" class="layui-btn layui-btn-sm" onclick="newcopy('url')">复制</a></td>
+                </tr>
+                <tr>
+                    <td>HTML</td>
+                    <td><input type="text" class="layui-input" id="html" data-cip-id="html"></td>
+                    <td><a href="javascript:;" class="layui-btn layui-btn-sm" onclick="newcopy('html')">复制</a></td>
+                </tr>
+                <tr>
+                    <td>MarkDown</td>
+                    <td><input type="text" class="layui-input" id="markdown" data-cip-id="markdown"></td>
+                    <td><a href="javascript:;" class="layui-btn layui-btn-sm" onclick="newcopy('markdown')">复制</a></td>
+                </tr>
+                <tr>
+                    <td>BBcode</td>
+                    <td><input type="text" class="layui-input" id="bbcode" data-cip-id="bbcode"></td>
+                    <td><a href="javascript:;" class="layui-btn layui-btn-sm" onclick="newcopy('bbcode')">复制</a></td>
+                </tr>
+            </tbody>
+        </table>
+        </center>
+	</div>
+</div>
+<!--图片查看-->
 <?php
     // 载入页脚
     // 载入头部
diff --git a/functions/version.txt b/functions/version.txt
index ac20a94..fd1d912 100644
--- a/functions/version.txt
+++ b/functions/version.txt
@@ -1 +1 @@
-v1.40(20181106)
\ No newline at end of file
+v1.41(20181119)
\ No newline at end of file
diff --git a/static/embed.js b/static/embed.js
index 3d5a5ae..09595eb 100644
--- a/static/embed.js
+++ b/static/embed.js
@@ -283,6 +283,7 @@ function deleteimg(id){
         $.get("./delete.php?id="+id,function(data,status){
             if(data == 'ok') {
                 $("#imgid"+id).remove();
+                console.log("#imgid"+id);
             }
             else{
                 alert(data);
@@ -474,4 +475,27 @@ function screen(page){
 	else{
 		window.location.href = page + "?page=1&date=" + starttime + '|' + endtime;
 	}
-}
\ No newline at end of file
+}
+//显示图片操作按钮
+function show_imgcon(id){
+    $("#imgcon" + id).show();
+}
+//隐藏图片操作按钮
+function hide_imgcon(id){
+    $("#imgcon" + id).hide();
+}
+//新版删除图片
+// function deleteimg(id){
+//     layer.confirm('确认删除？', {icon: 3, title:'温馨提示！'}, function(index){
+//         $.get("./delete.php?id="+id,function(data,status){
+//             if(data == 'ok') {
+//                 $("#imgid"+id).remove();
+//             }
+//             else{
+//                 alert(data);
+//             }
+//         });
+    
+//     layer.close(index);
+//     });
+// }
\ No newline at end of file
diff --git a/static/style.css b/static/style.css
index 2f348c2..df05dd6 100644
--- a/static/style.css
+++ b/static/style.css
@@ -98,6 +98,7 @@
     top:4em;
 }
 .picadmin{
+    /* display:table; */
 	margin:0 auto;
 	height:200px;
 	border:1px solid #ECECEC;
@@ -206,7 +207,8 @@
 	display: none;
 }
 #adminshow img{
-	max-width:680px;
+    max-width:680px;
+    max-height: 400px;
 	text-align:center;
 	
 }
@@ -236,4 +238,12 @@
 }
 #tongji a{
 	color:#FFFFFF;
+}
+/* 图片控制 */
+.imgcon{
+    position: absolute;
+    z-index: 99;
+    right:5px;
+    bottom: 5px;
+    display: none;
 }
\ No newline at end of file
diff --git a/tpl/admin/footer.php b/tpl/admin/footer.php
index 9af7239..e81bfd9 100644
--- a/tpl/admin/footer.php
+++ b/tpl/admin/footer.php
@@ -13,7 +13,7 @@
 
     <script src="../static/jquery.min.js"></script>
 	<script src="../static/layui/layui.js"></script>
-	<script src="../static/embed.js?v=1.31"></script>
+	<script src="../static/embed.js?v=v1.41"></script>
 	<script>
 	layui.use('laydate', function(){
 	  var laydate = layui.laydate;
diff --git a/tpl/admin/header.php b/tpl/admin/header.php
index c14ac02..df9709f 100644
--- a/tpl/admin/header.php
+++ b/tpl/admin/header.php
@@ -11,7 +11,7 @@
     <link rel="shortcut icon" href="../favicon.ico"  type="image/x-icon" />
 	<link rel="Bookmark" href="../favicon.ico" />
     <link rel="stylesheet" href="../static/layui/css/layui.css">
-    <link rel="stylesheet" href="../static/style.css?v=1.31">
+    <link rel="stylesheet" href="../static/style.css?v=v1.41">
     <script src = "../static/clipBoard.min.js"></script>
 </head>
 <body>
diff --git a/tpl/user/header.php b/tpl/user/header.php
index eca7200..1189b43 100644
--- a/tpl/user/header.php
+++ b/tpl/user/header.php
@@ -14,7 +14,7 @@
     <link rel="shortcut icon" href="favicon.ico"  type="image/x-icon" />
 	<link rel="Bookmark" href="favicon.ico" />
     <link rel="stylesheet" href="./static/layui/css/layui.css">
-    <link rel="stylesheet" href="./static/style.css?v=1.31">
+    <link rel="stylesheet" href="./static/style.css?v=v1.41">
     <script src = "./static/clipBoard.min.js"></script>
     <script src = "./static/ctrv-upload.js"></script>
 </head>