1. JS全局变量引入错误

2. 异常接管
yuan1994 · Dec 10, 2016 · 4eea7a5 · 4eea7a5
1 parent 20fddc1
commit 4eea7a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/application/admin/view/template/base.html b/application/admin/view/template/base.html
@@ -27,8 +27,8 @@
     <!--[if IE 6]>
     <script type="text/javascript" src="__LIB__/DD_belatedPNG_0.0.8a-min.js"></script>
     <script>DD_belatedPNG.fix('*');</script>
-    {include file='admin@template/javascript_vars' /}
     <![endif]-->
+    {include file='admin@template/javascript_vars' /}
 </head>
 <body>
 {block name="nav"}

diff --git a/extend/TpException.php b/extend/TpException.php
@@ -26,10 +26,10 @@ public function render(\Exception $e)
             http_response_code($statusCode);
         }
         //可以在此交由系统处理
-//        if (Request::instance()->isAjax()) {
-//            $error_code = $this->getCode($e) ?: 1;
-//            return ajax_return_adv_error($this->getMessage($e), $error_code);
-//        }
+        if (Request::instance()->isAjax()) {
+            $error_code = $this->getCode($e) ?: 1;
+            return ajax_return_adv_error($this->getMessage($e), $error_code);
+        }
         return parent::render($e);
     }