From a0c554194dac361bfeebf30bd24c2fa0c54bb7be Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Thu, 3 Nov 2016 14:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E7=89=88=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Index.php  |  3 +-
 application/admin/view/index/index.html |  7 +++-
 application/admin/view/public/404.html  | 21 +++--------
 application/admin/view/public/base.html |  2 +-
 public/static/admin/dist/js/template.js | 48 ++++++++++++++-----------
 5 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 6465ddd..7ccf41b 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -3,6 +3,7 @@ namespace app\admin\controller;
 
 class Index extends Base  {
     public function index() {
-        return (new PublicShow())->show_404();
+        $this->assign('title', '首页');
+        return $this->fetch();
     }
 }
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 5ab2f8a..13eff25 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -1 +1,6 @@
-Hello
\ No newline at end of file
+{extend name="public/base" /}
+{block name="main"}
+
+{/block}
+{block name="myScript"}
+{/block}
\ No newline at end of file
diff --git a/application/admin/view/public/404.html b/application/admin/view/public/404.html
index 9254f3e..0d11438 100644
--- a/application/admin/view/public/404.html
+++ b/application/admin/view/public/404.html
@@ -3,24 +3,13 @@
 <div class="error-page">
     <h2 class="headline text-yellow"> 404</h2>
     <div class="error-content">
-        <h3><i class="fa fa-warning text-yellow"></i> Oops! Page not found.</h3>
-
+        <h3><i class="fa fa-warning text-yellow"></i> 糟糕，页面没找到！ </h3>
         <p>
-            We could not find the page you were looking for.
-            Meanwhile, you may <a href="../../index.html">return to dashboard</a> or try using the search form.
+            您想要访问的页面没有找到。
+            您可以选择访问 <a href="{:url('Index/index')}">管理后台首页</a> 或者可以通过 <a href="{:config('WEBSITE_DOMAIN')}">官网</a> 寻求帮助！
         </p>
-
-        <form class="search-form">
-            <div class="input-group">
-                <input type="text" name="search" class="form-control" placeholder="Search">
-
-                <div class="input-group-btn">
-                    <button type="submit" name="submit" class="btn btn-warning btn-flat"><i class="fa fa-search"></i>
-                    </button>
-                </div>
-            </div>
-            <!-- /.input-group -->
-        </form>
     </div>
 </div>
+{/block}
+{block name="myScript"}
 {/block}
\ No newline at end of file
diff --git a/application/admin/view/public/base.html b/application/admin/view/public/base.html
index 1cd25ec..ad32414 100644
--- a/application/admin/view/public/base.html
+++ b/application/admin/view/public/base.html
@@ -357,7 +357,7 @@
         <div class="content-wrapper">
             <!-- 头部（面包屑导航） -->
             <section class="content-header">
-                <h1>404 Error Page</h1>
+                <h1>{$title}</h1>
                 <ol class="breadcrumb">
                     <li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>
                     <li><a href="#">Examples</a></li>
diff --git a/public/static/admin/dist/js/template.js b/public/static/admin/dist/js/template.js
index 1e1361d..d79d2bf 100644
--- a/public/static/admin/dist/js/template.js
+++ b/public/static/admin/dist/js/template.js
@@ -4,13 +4,30 @@
  * You should not use this file in production.
  * This file is for demo purposes only.
  */
-(function ($) {
+$.AdminTemplate = {};
+/**
+ * 格式化时间戳（为了和PHP的date函数统一，这里的时间戳都是10位，不包含毫秒）
+ * @param timestamp
+ * @returns {string}
+ */
+var formatDate = function ( timestamp ) {
+    timestamp *= 1000;
+    var date = new Date(timestamp);
+    var Y = date.getFullYear() + '-';
+    var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+    var D = (date.getDate()+1 < 10 ? '0'+(date.getDate()+1) : date.getDate()+1) + ' ';
+    var h = date.getHours() + ':';
+    var m = date.getMinutes() + ':';
+    var s = date.getSeconds();
+    return Y+M+D+h+m+s;
+};
+(function ($, AdminTemplate) {
 
     "use strict";
 
-    function create( jsonStr ) {
+    AdminTemplate.buildDom = function ( jsonStr ) {
 
-    }
+    };
 
     function emptyList() {
 
@@ -28,7 +45,7 @@
 
     }
 
-    function easyForm() {
+    function easyForm( formObj ) {
 
     }
 
@@ -44,21 +61,12 @@
 
     }
 
-    /**
-     * 格式化时间戳（为了和PHP的date函数统一，这里的时间戳都是10位，不包含毫秒）
-     * @param timestamp
-     * @returns {string}
-     */
-    function formatDate( timestamp ) {
-        timestamp *= 1000;
-        var date = new Date(timestamp);
-        var Y = date.getFullYear() + '-';
-        var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
-        var D = (date.getDate()+1 < 10 ? '0'+(date.getDate()+1) : date.getDate()+1) + ' ';
-        var h = date.getHours() + ':';
-        var m = date.getMinutes() + ':';
-        var s = date.getSeconds();
-        return Y+M+D+h+m+s;
+    function breadcrumb(  ) {
+
     }
 
-})(jQuery);
+    AdminTemplate.a = function () {
+
+    }
+
+})(jQuery, $.AdminTemplate);