diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php
index 51039b8a0..dc813d425 100644
--- a/application/admin/controller/Config.php
+++ b/application/admin/controller/Config.php
@@ -13,8 +13,11 @@ use controller\BasicAdmin;
  */
 class Config extends BasicAdmin {
 
-    public function index() {
+    protected $table = 'SystemConfig';
 
+    public function index() {
+        parent::_list($this->table);
+        
     }
 
 }
\ No newline at end of file
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 588d27965..ff773adf0 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -49,6 +49,6 @@ class Login extends BasicAdmin {
      */
     public function out() {
         session('user', null);
-        $this->success('退出登录成功！', '@admin / login');
+        $this->success('退出登录成功！', '@admin/login');
     }
 }
\ No newline at end of file
diff --git a/application/admin/view/config.index.html b/application/admin/view/config.index.html
new file mode 100644
index 000000000..3ccbc8508
--- /dev/null
+++ b/application/admin/view/config.index.html
@@ -0,0 +1,155 @@
+{extend name="extra@admin/content"}
+
+{block name="content"}
+<div class="panel panel-default">
+    <div class="panel-heading">网站设置</div>
+    <div class="panel-body">
+        <div style="height:20px;"></div>
+        <form class=" layui-form" data-auto="" method="post" style="padding-right:20px;">
+            <div class="row">
+                <div class="col-lg-6">
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">网站名称</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_name"
+                                   required="required"
+                                   title="请输入网站名称"
+                                   placeholder="请输入网站名称"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_name')}"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">网站域名</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_domain"
+                                   required="required"
+                                   title="请输入网站域名"
+                                   placeholder="请输入网站域名"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_domain')}"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">公司名称</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_company"
+                                   required="required"
+                                   title="请输入公司名称"
+                                   placeholder="请输入公司名称"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_company')}"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">百度统计ID</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_tongji_baidu"
+                                   title="请输入公司名称"
+                                   placeholder="请输入百度统计ID"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_tongji_baidu')}"
+                                   class="layui-input">
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">
+                            帮助统计网页访问情况，可以去<a target="_blank" href="http://tongji.baidu.com">百度统计</a>获取ID。
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">CNZZ统计ID</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_tongji_cnzz"
+                                   placeholder="请输入CNZZ统计ID"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_tongji_cnzz')}"
+                                   class="layui-input">
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">
+                            帮助统计网页访问情况，可以去<a target="_blank" href="https://tongji.cnzz.com">流量统计</a>获取ID。
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-6">
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">后台标题</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="site_name"
+                                   required="required"
+                                   title="请输入网站名称"
+                                   placeholder="请输入网站名称"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_name')}"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">系统版本</label>
+                        <div class="layui-input-block">
+                            <input type="text"
+                                   name="app_version"
+                                   required="required"
+                                   title="请输入网站域名"
+                                   placeholder="请输入网站域名"
+                                   autocomplete="off"
+                                   value="{:sysconf('app_version')}"
+                                   class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">网站Logo</label>
+                        <div class="layui-input-block">
+                            <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px"
+                                 src="{:sysconf('site_logo')}"/>
+                            <input type="text"
+                                   name="site_logo"
+                                   required="required"
+                                   title="请输入公司名称"
+                                   placeholder="请输入公司名称"
+                                   autocomplete="off"
+                                   value="{:sysconf('site_logo')}"
+                                   class="layui-input hide">
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">
+                            建议LOGO图片的尺寸为160x56px，此LOGO图片用于后台登陆页面。
+                        </div>
+                    </div>
+                    <div class="layui-form-item layui">
+                        <label class="layui-form-label">浏览器图标</label>
+                        <div class="layui-input-block">
+                            <img data-tips-image="" style="height:auto;max-height:32px;min-width:32px"
+                                 src="{:sysconf('app_logo')}"/>
+                            <input type="text"
+                                   name="app_logo"
+                                   title="请输入公司名称"
+                                   placeholder="请输入百度统计ID"
+                                   autocomplete="off"
+                                   value="{:sysconf('app_logo')}"
+                                   class="layui-input hide">
+                        </div>
+                        <div class="layui-form-mid layui-word-aux">
+                            建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，ICON在线制作。
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="layui-form-item layui">
+                <div class="layui-input-block text-center">
+                    <button class="layui-btn" type="submit">立即提交</button>
+                </div>
+            </div>
+        </form>
+    </div>
+
+</div>
+
+{/block}
\ No newline at end of file
diff --git a/application/extra/view/admin.content.html b/application/extra/view/admin.content.html
index 6437f21fb..e958bb233 100644
--- a/application/extra/view/admin.content.html
+++ b/application/extra/view/admin.content.html
@@ -17,4 +17,5 @@
         {block name="content"}
         {/block}
     </div>
+    {block name='script'}{/block}
 </div>
\ No newline at end of file
diff --git a/public/static/admin/plugs.js b/public/static/admin/plugs.js
index 0d08fed0e..1719db622 100644
--- a/public/static/admin/plugs.js
+++ b/public/static/admin/plugs.js
@@ -262,6 +262,7 @@ define(['zeroclipboard', 'jquery'], function (ZeroClipboard) {
                 });
             });
         });
+        layui.use(['form', 'element']);
         JPlaceHolder.init();
         /* 自动给必填字符加上样式 @zoujingli @by 2016-05-11 */
         $container.find('[required]').parent().prevAll('label').addClass('label-required');
diff --git a/public/static/theme/default/css/console.css b/public/static/theme/default/css/console.css
index a9fedefe0..1ad26738a 100644
--- a/public/static/theme/default/css/console.css
+++ b/public/static/theme/default/css/console.css
@@ -6,6 +6,13 @@
  * date 2017/02/13 14:15
  */
 
+/* layui 兼容处理  */
+.layui, .layui * {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+
 /* 设置选择文字及背景颜色 */
 ::selection {
     background-color: #ec494e;