diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php
index a937967e5..6b3782a61 100644
--- a/application/admin/controller/Auth.php
+++ b/application/admin/controller/Auth.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller;
 
 use controller\BasicAdmin;
@@ -19,4 +20,4 @@ class Auth extends BasicAdmin {
         parent::_list($this->table);
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/controller/Config.php b/application/admin/controller/Config.php
index dc813d425..3a50276d7 100644
--- a/application/admin/controller/Config.php
+++ b/application/admin/controller/Config.php
@@ -17,7 +17,6 @@ class Config extends BasicAdmin {
 
     public function index() {
         parent::_list($this->table);
-        
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 387f587f2..3e5c634a1 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -69,4 +69,4 @@ class Index extends BasicAdmin {
         return view();
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index ff773adf0..9b411eaa7 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller;
 
 use controller\BasicAdmin;
@@ -13,7 +14,6 @@ use think\Db;
  */
 class Login extends BasicAdmin {
 
-
     /**
      * 控制器基础方法
      */
@@ -51,4 +51,5 @@ class Login extends BasicAdmin {
         session('user', null);
         $this->success('退出登录成功！', '@admin/login');
     }
-}
\ No newline at end of file
+
+}
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index 14f29e891..f2714addc 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -127,7 +127,6 @@ class Menu extends BasicAdmin {
         }
     }
 
-
     /**
      * 添加菜单
      */
diff --git a/application/admin/controller/Role.php b/application/admin/controller/Role.php
index 50b87cd5f..f0dca22a4 100644
--- a/application/admin/controller/Role.php
+++ b/application/admin/controller/Role.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller;
 
 use controller\BasicAdmin;
@@ -18,4 +19,4 @@ class Role extends BasicAdmin {
         parent::_list($this->table);
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index ed04ff309..baaea8724 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\controller;
 
 use controller\BasicAdmin;
@@ -18,4 +19,4 @@ class User extends BasicAdmin {
         parent::_list($this->table);
     }
 
-}
\ No newline at end of file
+}
diff --git a/application/admin/model/User.php b/application/admin/model/User.php
index 564d87b71..ca7444861 100644
--- a/application/admin/model/User.php
+++ b/application/admin/model/User.php
@@ -2,9 +2,8 @@
 
 namespace app\admin\model;
 
-
 use think\Model;
 
 class User extends Model {
-
-}
\ No newline at end of file
+    
+}
diff --git a/application/admin/view/index.main.html b/application/admin/view/index.main.html
index 543b57798..006bf9332 100644
--- a/application/admin/view/index.main.html
+++ b/application/admin/view/index.main.html
@@ -5,82 +5,82 @@
     <div class="col-sm-6">
         <table class="layui-table" lay-even lay-skin="nob">
             <thead>
-            <tr>
-                <th class="text-center" colspan="2">系统信息</th>
-            </tr>
+                <tr>
+                    <th class="text-center" colspan="2">系统信息</th>
+                </tr>
             </thead>
             <tbody>
-            <tr>
-                <td>框架版本</td>
-                <td>{$Think.const.THINK_VERSION}</td>
-            </tr>
-            <tr>
-                <td>系统类型</td>
-                <td>{:php_uname('s')}</td>
-            </tr>
-            <tr>
-                <td>运行环境</td>
-                <td>{:php_sapi_name()}</td>
-            </tr>
-            <tr>
-                <td>PHP版本</td>
-                <td>{:phpversion()}</td>
-            </tr>
-            <tr>
-                <td>MySQL版本</td>
-                <td>{$mysql_ver}</td>
-            </tr>
-            <tr>
-                <td>上传限制</td>
-                <td>{:ini_get('upload_max_filesize')}</td>
-            </tr>
-            <tr>
-                <td>POST限制</td>
-                <td>{:ini_get('post_max_size')}</td>
-            </tr>
+                <tr>
+                    <td>框架版本</td>
+                    <td>{$Think.const.THINK_VERSION}</td>
+                </tr>
+                <tr>
+                    <td>系统类型</td>
+                    <td>{:php_uname('s')}</td>
+                </tr>
+                <tr>
+                    <td>运行环境</td>
+                    <td>{:php_sapi_name()}</td>
+                </tr>
+                <tr>
+                    <td>PHP版本</td>
+                    <td>{:phpversion()}</td>
+                </tr>
+                <tr>
+                    <td>MySQL版本</td>
+                    <td>{$mysql_ver}</td>
+                </tr>
+                <tr>
+                    <td>上传限制</td>
+                    <td>{:ini_get('upload_max_filesize')}</td>
+                </tr>
+                <tr>
+                    <td>POST限制</td>
+                    <td>{:ini_get('post_max_size')}</td>
+                </tr>
             </tbody>
         </table>
     </div>
     <div class="col-sm-6">
         <table class="layui-table" lay-even lay-skin="nob">
             <thead>
-            <tr>
-                <th class="text-center" colspan="2">产品团队</th>
-            </tr>
+                <tr>
+                    <th class="text-center" colspan="2">产品团队</th>
+                </tr>
             </thead>
             <tbody>
-            <tr>
-                <td>产品名称</td>
-                <td>Think.Admin</td>
-            </tr>
-            <tr>
-                <td>当前版本</td>
-                <td>{:sysconf('app_version')}</td>
-            </tr>
-            <tr>
-                <td>产品设计及研发团队</td>
-                <td>广州楚才信息科技有限公司</td>
-            </tr>
-            <tr>
-                <td>官方网址</td>
-                <td>https://think.ctolog.com</td>
-            </tr>
-            <tr>
-                <td>官方QQ群</td>
-                <td>
-                    <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a">
-                        <img src="http://pub.idqqimg.com/wpa/images/group.png" alt="PHP微信开发群 (SDK)">
-                    </a>
-                </td>
-            </tr>
-            <tr>
-                <td>BUG反馈</td>
-                <td>https://github.com/zoujingli/Think.Admin/issues</td>
-            </tr>
-            <tr>
-                <td>项目地址</td>
-                <td>https://github.com/zoujingli/Think.Admin</td>
-            </tr>
+                <tr>
+                    <td>产品名称</td>
+                    <td>Think.Admin</td>
+                </tr>
+                <tr>
+                    <td>当前版本</td>
+                    <td>{:sysconf('app_version')}</td>
+                </tr>
+                <tr>
+                    <td>产品设计及研发团队</td>
+                    <td>广州楚才信息科技有限公司</td>
+                </tr>
+                <tr>
+                    <td>官方网址</td>
+                    <td>https://think.ctolog.com</td>
+                </tr>
+                <tr>
+                    <td>官方QQ群</td>
+                    <td>
+                        <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=ae25cf789dafbef62e50a980ffc31242f150bc61a61164458216dd98c411832a">
+                            <img src="http://pub.idqqimg.com/wpa/images/group.png" alt="PHP微信开发群 (SDK)">
+                        </a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>BUG反馈</td>
+                    <td>https://github.com/zoujingli/Think.Admin/issues</td>
+                </tr>
+                <tr>
+                    <td>项目地址</td>
+                    <td>https://github.com/zoujingli/Think.Admin</td>
+                </tr>
             </tbody>
         </table>
     </div>
diff --git a/application/admin/view/login.index.html b/application/admin/view/login.index.html
index 499719cea..5b31e6f5a 100644
--- a/application/admin/view/login.index.html
+++ b/application/admin/view/login.index.html
@@ -4,8 +4,7 @@
 <link rel="stylesheet" href="__STATIC__/theme/default/css/login.css">
 {/block}
 
-{block name="bodyTag"}
-<body>
+{block name="body"}
 <div class="login-container" style="height:100%">
 
     <div class="clouds clouds-footer"></div>
@@ -72,6 +71,9 @@
     </div>
     <div class="footer">{:sysconf('site_company')} &copy; {:date('Y')}</div>
 </div>
+{/block}
+
+{block name="script"}
 <script>
     require(['jquery'], function ($) {
         $('[name="password"]').on('focus', function () {
@@ -83,5 +85,4 @@
         });
     });
 </script>
-</body>
 {/block}
\ No newline at end of file
diff --git a/application/admin/view/menu.index.html b/application/admin/view/menu.index.html
index bfc20dea2..db1e596da 100644
--- a/application/admin/view/menu.index.html
+++ b/application/admin/view/menu.index.html
@@ -9,9 +9,7 @@
                 <th class='list-table-check-td'>
                     <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
                 </th>
-                <th class='list-table-sort-td'>
-                    <button>排序</button>
-                </th>
+                <th class='list-table-sort-td'><button>排序</button></th>
                 <th class='text-center'></th>
                 <th>菜单名称</th>
                 <th>链接</th>