From 177b2c91f1cd68fa86a0d5e682106cf03a8aa80e Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Mon, 21 Nov 2016 20:00:52 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=96=B9=E6=B3=95=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/PublicShow.php | 13 ++++++-------
 application/install/view/index/step3.html   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/application/admin/controller/PublicShow.php b/application/admin/controller/PublicShow.php
index daa505b..ec81573 100644
--- a/application/admin/controller/PublicShow.php
+++ b/application/admin/controller/PublicShow.php
@@ -11,16 +11,15 @@ namespace app\admin\controller;
 class PublicShow extends Base {
 
     public function show_404(){
-        $this->assign('title', '页面丢失了！');
-        return $this->fetch('public/404');
+        if( !$this->request->isAjax() ){
+            $this->assign('title', '页面丢失了！');
+            return $this->fetch('public/404');
+        }else{
+            $this->error('页面不存在！');
+        }
     }
 
     public function show_500(){
         return $this->fetch('public/500');
     }
-
-    public function showBreadcrumb(){
-
-    }
-
 }
\ No newline at end of file
diff --git a/application/install/view/index/step3.html b/application/install/view/index/step3.html
index 794ecb9..b97f211 100644
--- a/application/install/view/index/step3.html
+++ b/application/install/view/index/step3.html
@@ -50,7 +50,7 @@
             </tbody>
         </table>
         <table class="table table-hover">
-            <caption><h4>数据库依赖检测</h4></caption>
+            <caption><h4>数据库依赖检查</h4></caption>
             <thead>
             <tr>
                 <th>名称</th>
@@ -68,7 +68,7 @@
         </table>
         {if condition="isset($checkCache)"}
         <table class="table table-hover">
-            <caption><h4>缓存依赖检测</h4></caption>
+            <caption><h4>缓存依赖检查</h4></caption>
             <thead>
             <tr>
                 <th>名称</th>