From 1740495c3f4f041ba12b9c54d2daa5863f463426 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Wed, 24 Oct 2018 11:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=9B=A0=E4=B8=BA=E5=A4=A7=E5=B0=8F=E5=86=99=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=96=87=E4=BB=B6=E6=A8=A1=E7=89=88=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/system/SystemFile.php       |  4 ++--
 .../admin/view/system/system_file/opendir.php    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/system/SystemFile.php b/application/admin/controller/system/SystemFile.php
index 0ecbc1b4..87eb8417 100644
--- a/application/admin/controller/system/SystemFile.php
+++ b/application/admin/controller/system/SystemFile.php
@@ -17,7 +17,7 @@ use service\JsonService as Json;
 class SystemFile extends AuthController
 {
     //打开目录
-    public function openDir($filedir=''){
+    public function opendir($filedir=''){
         $fileAll = array('dir'=>[],'file'=>[]);
         if(Request::instance()->param('superior') && !empty(Request::instance()->param('dir'))){
             $path = '.'.DS.Request::instance()->param('dir');
@@ -43,7 +43,7 @@ class SystemFile extends AuthController
         return $this->fetch();
     }
     //读取文件
-    public function openFile($file='')
+    public function openfile($file='')
     {
         $file = $this->request->param('file');
         if(empty($file))return Json::fail('出现错误');
diff --git a/application/admin/view/system/system_file/opendir.php b/application/admin/view/system/system_file/opendir.php
index b4557b86..19ab37ce 100644
--- a/application/admin/view/system/system_file/opendir.php
+++ b/application/admin/view/system/system_file/opendir.php
@@ -20,14 +20,14 @@
                         <tbody class="">
                         <tr>
                             <td class="text-left" colspan="3">
-                                <span> <i class="fa fa-folder-o"></i> <a href="{:Url('openDir')}?dir={$dir}&superior=1">返回上级</a></span>
+                                <span> <i class="fa fa-folder-o"></i> <a href="{:Url('opendir')}?dir={$dir}&superior=1">返回上级</a></span>
                             </td>
                             <td class="text-center"></td>
                         </tr>
                         {volist name="fileAll['dir']" id="vo"}
                         <tr>
                             <td class="text-left">
-                                <span> <i class="fa fa-folder-o"></i> <a href="{:Url('openDir')}?dir={$dir}&filedir={$vo.filename}">{$vo.filename}</a></span>
+                                <span> <i class="fa fa-folder-o"></i> <a href="{:Url('opendir')}?dir={$dir}&filedir={$vo.filename}">{$vo.filename}</a></span>
                             </td>
                             <td class="text-left">
                                 <span> {$vo.size}</span>
@@ -37,7 +37,7 @@
                             </td>
 
                             <td class="text-center">
-                                <a class="btn btn-info btn-xs" href="{:Url('openDir')}?dir={$dir}&filedir={$vo.filename}"><i class="fa fa-paste"></i> 打开</a>
+                                <a class="btn btn-info btn-xs" href="{:Url('opendir')}?dir={$dir}&filedir={$vo.filename}"><i class="fa fa-paste"></i> 打开</a>
 
                             </td>
                         </tr>
@@ -45,7 +45,7 @@
                         {volist name="fileAll['file']" id="vo"}
                         <tr>
                             <td class="text-left">
-                                <span onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openFile')}?file={$dir}/{$vo.filename}',{w:1260,h:600})"> <i class="fa fa-file-text-o"></i> {$vo.filename}</span>
+                                <span onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openfile')}?file={$dir}/{$vo.filename}',{w:1260,h:600})"> <i class="fa fa-file-text-o"></i> {$vo.filename}</span>
                             </td>
                             <td class="text-left">
                                 <span> {$vo.size}</span>
@@ -55,10 +55,10 @@
                             </td>
 
                             <td class="text-center">
-                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openFile')}?file={$dir}/{$vo.filename}',{w:1260,h:660})"><i class="fa fa-paste"></i> 编辑</button>
-<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openFile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 重命名</button>-->
-<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openFile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 删除</button>-->
-<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openFile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 下载</button>-->
+                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openfile')}?file={$dir}/{$vo.filename}',{w:1260,h:660})"><i class="fa fa-paste"></i> 编辑</button>
+<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openfile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 重命名</button>-->
+<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openfile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 删除</button>-->
+<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('{$vo.filename}','{:Url('openfile')}?file={$vo.filename}&dir={$dir}',{w:1260,h:600})"><i class="fa fa-paste"></i> 下载</button>-->
 
                             </td>
                         </tr>