dever 6 years ago
parent
commit
ef2b534860
3 changed files with 15 additions and 7 deletions
  1. 3 3
      assets/html/show.html
  2. 1 0
      database/upload.php
  3. 11 4
      src/View.php

+ 3 - 3
assets/html/show.html

@@ -27,10 +27,10 @@
 
 <div class="layui-card"  id="component-anim">
   <div class="layui-card-header">
-  	<input type="hidden" class="file_key" value="<{$config.id}>">
+  	<input type="hidden" class="file_key" value="<{$key}>">
   	<input type="hidden" class="file_pg" value="<{$search_pg}>">
   	<input type="hidden" class="file_cur" value="<{$cur}>">
-  	<div class="layui-inline"><div class="layui-input-inline"><input type="text" style="width: 100%;" class="layui-input file_filename" value="<{$search_name}>" autocomplete="new-password" placeholder="文件名"></div></div>
+  	<div class="layui-inline"><div class="layui-input-inline"><input type="text" style="width: 100%;" class="layui-input file_filename" value="<{$search_name}>" autocomplete="new-password" placeholder="<{$name}>"></div></div>
 
   	<div class="layui-inline" style="display: none;"><div class="layui-input-inline"><input type="text" style="width: 100%;"  class="layui-input file_tag" value="<{$search_tag}>" autocomplete="new-password" placeholder="标签"></div></div>
 
@@ -48,7 +48,7 @@
     <ul class="component-anim-demo">
     	<{loop($file):}>
       <li class="<{if(strstr($cur, $v1.url)):}>layui-anim-yes<{else:}>layui-anim-no<{endif}>">
-        <div class="layui-anim" data-anim="layui-anim-up" onclick="showUploadFilesSet($(this), '<{$v1.name}>','<{$v1.url}>')"><img src="<{$v1.pic}>" style="max-width: 150px;max-height: 100px;margin-left: 10px;"/></div>
+        <div class="layui-anim" data-anim="layui-anim-up" onclick="showUploadFilesSet($(this), '<{$v1.name}>','<{$v1.url}>','<{$v1.id}>')"><img src="<{$v1.pic}>" style="max-width: 150px;max-height: 100px;margin-left: 10px;"/></div>
         <div class="code"><{$v1.source_name}></div>
       </li>
       <{endloop}>

+ 1 - 0
database/upload.php

@@ -148,6 +148,7 @@ return array
 			'"默认音频配置",1,"mp3",1,' . time(),
 			'"默认视频配置",1,"video",1,' . time(),
 			'"默认文件配置",1,"jpg,png,gif,doc,pdf,rar,zip,xls,xlsx,docx,msi",1,' . time(),
+			'"默认音视频配置",1,"video,mp3,flv,mp4",1,' . time(),
 		),
 	),
 

+ 11 - 4
src/View.php

@@ -36,12 +36,19 @@ class View
         $data['search_cate'] = $cate;
         $data['search_tag'] = $tag;
         $data['search_name'] = $name;
+        $data['key'] = $key;
 
-        $data['file'] = Dever::db('upload/file')->getData($param);
+        if (!is_numeric($key)) {
+            $data += Dever::load($key);
+        } else {
+            $data['name'] = '文件名';
+            $data['file'] = Dever::db('upload/file')->getData($param);
+            $data['cate'] = Dever::db('upload/cate')->state();
+            $data['config'] = Dever::db('upload/upload')->one($key);
+        }
+        
         $data['total'] = Dever::total();
-        $data['cate'] = Dever::db('upload/cate')->state();
-        $data['config'] = Dever::db('upload/upload')->one($key);
-
+        
         if ($data['file']) {
             foreach ($data['file'] as $k => $v) {
                 $data['file'][$k]['url'] = Dever::upload('{uploadRes}' . $v['file']);