diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html
index 5233aaf64..2aac8b572 100644
--- a/app/admin/view/auth/index.html
+++ b/app/admin/view/auth/index.html
@@ -1,15 +1,12 @@
 {extend name='main'}
 
 {block name="button"}
-
-{if auth("add")}
+<!--{if auth("add")}-->
 <button data-modal='{:url("add")}' data-title="添加权限" class='layui-btn layui-btn-sm layui-btn-primary'>添加权限</button>
-{/if}
-
-{if auth("remove")}
+<!--{/if}-->
+<!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除这些权限吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除权限</button>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name="content"}
diff --git a/app/admin/view/auth/index_search.html b/app/admin/view/auth/index_search.html
index 458fa6143..42db3d1d0 100644
--- a/app/admin/view/auth/index_search.html
+++ b/app/admin/view/auth/index_search.html
@@ -22,8 +22,7 @@
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
             </div>
         </div>
diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html
index 0de4ea653..1650e3501 100644
--- a/app/admin/view/config/index.html
+++ b/app/admin/view/config/index.html
@@ -1,15 +1,12 @@
 {extend name="main"}
 
 {block name="button"}
-
-{if session('user.username') eq 'admin'}
+<!--{if session('user.username') eq 'admin'}-->
 <a class="layui-btn layui-btn-sm layui-btn-primary" data-queue="{:url('admin/api.plugs/optimize')}">优化数据库</a>
-{/if}
-
-{if auth('system')}
+<!--{/if}-->
+<!--{if auth('system')}-->
 <a class="layui-btn layui-btn-sm layui-btn-primary" data-modal="{:url('system')}">修改系统参数</a>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name="content"}
diff --git a/app/admin/view/config/storage-alioss.html b/app/admin/view/config/storage-alioss.html
index 638809334..a335e31e4 100644
--- a/app/admin/view/config/storage-alioss.html
+++ b/app/admin/view/config/storage-alioss.html
@@ -37,8 +37,7 @@
                     <option selected value="{$point}">{$title} {$point}</option>
                     {else}
                     <option value="{$point}">{$title} {$point}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
                 <p class="help-block">阿里云OSS存储空间所在区域，需要严格对应储存所在区域才能上传文件</p>
             </div>
diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html
index c24ea344f..d318c6b9b 100644
--- a/app/admin/view/menu/index.html
+++ b/app/admin/view/menu/index.html
@@ -1,15 +1,12 @@
 {extend name='main'}
 
 {block name="button"}
-
-{if auth("add")}
+<!--{if auth("add")}-->
 <button data-modal='{:url("add")}' data-title="添加菜单" class='layui-btn layui-btn-sm layui-btn-primary'>添加菜单</button>
-{/if}
-
-{if auth("remove")}
+<!--{/if}-->
+<!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-csrf="{:systoken('remove')}" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>删除菜单</button>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name="content"}
diff --git a/app/admin/view/module/index.html b/app/admin/view/module/index.html
index 904603202..363c6c8f1 100644
--- a/app/admin/view/module/index.html
+++ b/app/admin/view/module/index.html
@@ -1,7 +1,6 @@
 {extend name='main'}
 
 {block name="content"}
-
 <div class="think-box-shadow table-block">
     <table class="layui-table margin-top-15" lay-skin="line">
         {notempty name='modules'}
diff --git a/app/admin/view/module/index_search.html b/app/admin/view/module/index_search.html
index e636357cb..c148825bc 100644
--- a/app/admin/view/module/index_search.html
+++ b/app/admin/view/module/index_search.html
@@ -1,4 +1,3 @@
-
 <fieldset>
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html
index 1f81a63bf..b8df29964 100644
--- a/app/admin/view/oplog/index.html
+++ b/app/admin/view/oplog/index.html
@@ -1,15 +1,12 @@
 {extend name='main'}
 
 {block name="button"}
-
-{if auth("clear")}
+<!--{if auth("clear")}-->
 <button data-load='{:url("clear")}' data-confirm="确定要消除所有日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>清理日志</button>
-{/if}
-
-{if auth("remove")}
+<!--{/if}-->
+<!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" data-confirm="确定要删除日志吗？" class='layui-btn layui-btn-sm layui-btn-primary'>删除日志</button>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name="content"}
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index da4f149ef..778ed52c9 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -1,23 +1,18 @@
 {extend name='main'}
 
 {block name="button"}
-
-{if auth("start") && $iswin}
+<!--{if auth("start") && $iswin}-->
 <button data-load='{:url("start")}' class='layui-btn layui-btn-sm layui-btn-primary'>开始监听</button>
-{/if}
-
-{if auth("stop") && $iswin}
+<!--{/if}-->
+<!--{if auth("stop") && $iswin}-->
 <button data-load='{:url("stop")}' data-confirm="确定要停止主进程监听吗？" class='layui-btn layui-btn-sm layui-btn-primary'>停止监听</button>
-{/if}
-
-{if auth("remove")}
+<!--{/if}-->
+<!--{if auth("remove")}-->
 <button data-action='{:url("remove")}' data-rule="id#{key}" data-confirm="确定批量删除任务吗？" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</button>
-{/if}
-
-{if auth("clear")}
+<!--{/if}-->
+<!--{if auth("clear")}-->
 <button data-load='{:url("clear")}' data-confirm="确定要创建定时清理任务吗？" class='layui-btn layui-btn-sm layui-btn-primary'>定时清理</button>
-{/if}
-
+<!--{/if}-->
 {/block}
 
 {block name="content"}
@@ -101,9 +96,9 @@
                     {/if}
 
                     {eq name='vo.status' value='1'}
-                    <span class="layui-badge layui-bg-black">待处理</span>
+                    <span class="layui-badge layui-bg-black">等待处理</span>
                     {elseif $vo.status eq 2}
-                    <span class="layui-badge layui-bg-green">处理中</span>
+                    <span class="layui-badge layui-bg-green">正在处理</span>
                     {elseif $vo.status eq 3}
                     <span class="layui-badge layui-bg-blue">处理完成</span>
                     {elseif $vo.status eq 4 and auth('redo')}
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index b34cfa02d..00869e177 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -39,13 +39,12 @@
             <label class="layui-form-label">任务状态</label>
             <div class="layui-input-inline">
                 <select name="status" class="layui-select">
-                    {foreach [''=>'-- 全部状态 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v}
+                    {foreach [''=>'-- 全部状态 --','1'=>'等待处理','2'=>'正在处理','3'=>'处理完成','4'=>'处理失败'] as $k=>$v}
                     {if input('get.status') eq $k}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
             </div>
         </div>
diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html
index 9ce104e97..35ab68be8 100644
--- a/app/admin/view/user/index.html
+++ b/app/admin/view/user/index.html
@@ -1,7 +1,6 @@
 {extend name='main'}
 
 {block name="button"}
-
 {if isset($type) and $type eq 'all'}
 <!--{if auth("add")}-->
 <button data-modal='{:url("add")}' data-title="添加用户" class='layui-btn layui-btn-sm layui-btn-primary'>添加用户</button>
@@ -17,7 +16,6 @@
 <a data-confirm="确定要永久删除这些账号吗？" data-action='{:url("remove")}' data-rule="id#{key}" data-csrf="{:systoken('remove')}" class='layui-btn layui-btn-sm layui-btn-primary'>批量删除</a>
 <!--{/if}-->
 {/if}
-
 {/block}
 
 {block name="content"}