diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html
index 7b6a5e377..b67cc2151 100644
--- a/app/admin/view/auth/index.html
+++ b/app/admin/view/auth/index.html
@@ -42,15 +42,17 @@
                 <!--{if auth("edit")}-->
                 <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑权限" data-modal='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 <!--{/if}-->
+
                 <!--{if auth("apply")}-->
                 <a class="layui-btn layui-btn-normal layui-btn-sm" data-open='{:url("apply")}?id={$vo.id}'>授 权</a>
                 <!--{/if}-->
+
                 <!--{if $vo.status eq 1 and auth("state")}-->
                 <a class="layui-btn layui-btn-warm layui-btn-sm" data-confirm="确定禁用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
-                <!--{/if}-->
-                <!--{if $vo.status eq 0 and auth("state")}-->
+                <!--{elseif $vo.status eq 0 and auth("state")}-->
                 <a class="layui-btn layui-btn-warm layui-btn-sm" data-confirm="确定启用该权限吗？" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">激 活</a>
                 <!--{/if}-->
+
                 <!--{if auth("remove")}-->
                 <a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="确定要删除权限吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}" data-csrf="{:systoken('remove')}">删 除</a>
                 <!--{/if}-->
diff --git a/app/admin/view/auth/index_search.html b/app/admin/view/auth/index_search.html
index 951aa5190..d092100fb 100644
--- a/app/admin/view/auth/index_search.html
+++ b/app/admin/view/auth/index_search.html
@@ -7,17 +7,20 @@
                 <input name="title" value="{:input('get.title')}" placeholder="请输入权限名称" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">权限描述</label>
             <div class="layui-input-inline">
                 <input name="desc" value="{:input('get.desc')}" placeholder="请输入权限描述" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'-- 全部状态 --','0'=>'已禁用的权限','1'=>'已激活的权限'] as $k=>$v}
+                    <option value=''>-- 全部状态 --</option>
+                    {foreach ['已禁用的权限','已激活的权限'] as $k=>$v}
                     {if input('get.status') eq $k.""}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -26,12 +29,14 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <div class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('get.create_at')}" placeholder="请选择创建时间" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
diff --git a/app/admin/view/config/index.html b/app/admin/view/config/index.html
index 45ae8db67..19baa5ccc 100644
--- a/app/admin/view/config/index.html
+++ b/app/admin/view/config/index.html
@@ -4,6 +4,7 @@
 <!--{if session('user.username') eq 'admin'}-->
 <a class="layui-btn layui-btn-sm layui-btn-primary" data-load="{:url('admin/api.plugs/clearConfig')}">清理无效配置</a>
 <!--{/if}-->
+
 <!--{if auth('system')}-->
 <a class="layui-btn layui-btn-sm layui-btn-primary" data-modal="{:url('system')}">修改系统参数</a>
 <!--{/if}-->
diff --git a/app/admin/view/menu/form.html b/app/admin/view/menu/form.html
index 0b2afe413..3c95af378 100644
--- a/app/admin/view/menu/form.html
+++ b/app/admin/view/menu/form.html
@@ -6,13 +6,11 @@
             <label class="layui-form-label label-required-next">上级菜单</label>
             <div class="layui-input-block">
                 <select name='pid' class='layui-select' lay-search>
-                    {foreach $menus as $menu}
-                    {eq name='menu.id' value='$vo.pid|default=0'}
+                    {foreach $menus as $menu}{eq name='menu.id' value='$vo.pid|default=0'}
                     <option selected value='{$menu.id}'>{$menu.spl|raw}{$menu.title}</option>
                     {else}
                     <option value='{$menu.id}'>{$menu.spl|raw}{$menu.title}</option>
-                    {/eq}
-                    {/foreach}
+                    {/eq}{/foreach}
                 </select>
                 <p class="help-block"><b>必选</b>，请选择上级菜单或顶级菜单（目前最多支持三级菜单）</p>
             </div>
diff --git a/app/admin/view/oplog/index_search.html b/app/admin/view/oplog/index_search.html
index c8a910d21..9f3f93389 100644
--- a/app/admin/view/oplog/index_search.html
+++ b/app/admin/view/oplog/index_search.html
@@ -62,6 +62,6 @@
             });
             data.unshift(['操作账号', '访问节点', '访问IP地址', '访问地理区域', '访问操作', '操作时间']);
             return data;
-        }, '访问日志');
+        }, '操作日志');
     });
 </script>
\ No newline at end of file
diff --git a/app/admin/view/queue/index_search.html b/app/admin/view/queue/index_search.html
index 5f6fac1f9..ea0798426 100644
--- a/app/admin/view/queue/index_search.html
+++ b/app/admin/view/queue/index_search.html
@@ -20,18 +20,21 @@
                 <input name="code" value="{:input('get.code')}" placeholder="请输入任务编号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">任务名称</label>
             <label class="layui-input-inline">
                 <input name="title" value="{:input('get.title')}" placeholder="请输入任务名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">任务指令</label>
             <label class="layui-input-inline">
                 <input name="command" value="{:input('get.command')}" placeholder="请输入任务指令" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">任务状态</label>
             <label class="layui-input-inline">
@@ -46,24 +49,28 @@
                 </select>
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">计划时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="exec_time" value="{:input('get.exec_time')}" placeholder="请选择计划时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">执行时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="enter_time" value="{:input('get.enter_time')}" placeholder="请选择执行时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('get.create_at')}" placeholder="请选择创建时间" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
diff --git a/app/admin/view/user/form.html b/app/admin/view/user/form.html
index ade4eb88b..001f432ae 100644
--- a/app/admin/view/user/form.html
+++ b/app/admin/view/user/form.html
@@ -26,6 +26,7 @@
                 </label>
             </div>
         </div>
+
         <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <div class="layui-row layui-col-space15">
             <div class="layui-col-xs4">
@@ -50,6 +51,7 @@
                 </label>
             </div>
         </div>
+
         {notempty name='authorizes'}
         <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <div class="layui-form-item">
@@ -74,13 +76,16 @@
             </div>
         </div>
         {/notempty}
+
         <div class="hr-line-dashed margin-top-10 margin-bottom-10"></div>
         <label class="layui-form-item block relative">
             <span class="color-green font-w7">用户描述</span><span class="color-desc margin-left-5">User Remark</span>
             <textarea placeholder="请输入用户描述" class="layui-textarea" name="describe">{$vo.describe|default=""}</textarea>
         </label>
+
         <div class="hr-line-dashed"></div>
         {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
         <div class="layui-form-item text-center">
             <button class="layui-btn" type='submit'>保存数据</button>
             <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
diff --git a/app/admin/view/user/index_search.html b/app/admin/view/user/index_search.html
index 0dd0e312c..448ce5038 100644
--- a/app/admin/view/user/index_search.html
+++ b/app/admin/view/user/index_search.html
@@ -7,30 +7,35 @@
                 <input name="username" value="{:input('get.username')}" placeholder="请输入用户名" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">联系手机</label>
             <label class="layui-input-inline">
                 <input name="phone" value="{:input('get.phone')}" placeholder="请输入联系手机" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">联系邮箱</label>
             <label class="layui-input-inline">
                 <input name="mail" value="{:input('get.mail')}" placeholder="请输入联系邮箱" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">最后登录</label>
             <div class="layui-input-inline">
                 <input data-date-range name="login_at" value="{:input('get.login_at')}" placeholder="请选择登录时间" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">创建时间</label>
             <div class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('get.create_at')}" placeholder="请选择创建时间" class="layui-input">
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
diff --git a/app/admin/view/user/pass.html b/app/admin/view/user/pass.html
index 70e49d678..63ac2a650 100644
--- a/app/admin/view/user/pass.html
+++ b/app/admin/view/user/pass.html
@@ -12,6 +12,7 @@
             </label>
             <p class="help-block">登录用户账号创建后，不允许再次修改。</p>
         </div>
+
         <!--{if $verify}-->
         <div class="layui-form-item">
             <label class="relative block">
@@ -22,6 +23,7 @@
             <p class="color-desc">请输入旧密码来验证修改权限，旧密码不限制格式。</p>
         </div>
         <!--{/if}-->
+
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">新的登录密码</span>
@@ -30,6 +32,7 @@
             </label>
             <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
+
         <div class="layui-form-item">
             <label class="relative block">
                 <span class="color-green font-w7">重复登录密码</span>
@@ -39,8 +42,10 @@
             <p class="color-desc">密码必需包含大小写字母、数字、符号的任意两者组合。</p>
         </div>
     </div>
+
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
diff --git a/app/wechat/view/fans/index.html b/app/wechat/view/fans/index.html
index 7479a6a3a..e0ad45613 100644
--- a/app/wechat/view/fans/index.html
+++ b/app/wechat/view/fans/index.html
@@ -57,17 +57,14 @@
                 日期：{$vo.subscribe_at|format_datetime|str_replace=' ','<br>时间：',###|raw}
             </td>
             <td class='text-center nowrap'>
-                {eq name='vo.subscribe' value='0'}<span class="layui-badge">未订阅</span>{else}<span class="layui-badge layui-bg-green">已订阅</span>{/eq}
-                <br>
-                {eq name='vo.is_black' value='0'}<span class="layui-badge layui-bg-green">未拉黑</span>{else}<span class="layui-badge">已拉黑</span>{/eq}
+                <div>{eq name='vo.subscribe' value='0'}<span class="layui-badge">未订阅</span>{else}<span class="layui-badge layui-bg-green">已订阅</span>{/eq}</div>
+                <div>{eq name='vo.is_black' value='0'}<span class="layui-badge layui-bg-green">未拉黑</span>{else}<span class="layui-badge">已拉黑</span>{/eq}</div>
             </td>
             <td class="nowrap">
 
                 <!--{if auth('blackAdd') and $vo.is_black eq 0}-->
                 <a class="layui-btn layui-btn-sm" data-action="{:url('blackAdd')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('blackAdd')}">拉 黑</a>
-                <!--{/if}-->
-
-                <!--{if auth('blackDel') and $vo.is_black eq 1}-->
+                <!--{elseif auth('blackDel') and $vo.is_black eq 1}-->
                 <a class="layui-btn layui-btn-sm" data-action="{:url('blackDel')}" data-value="openid#{$vo.openid}" data-csrf="{:systoken('blackDel')}">移 出</a>
                 <!--{/if}-->
 
diff --git a/app/wechat/view/fans/index_search.html b/app/wechat/view/fans/index_search.html
index c9be8434e..98cb5eb8d 100644
--- a/app/wechat/view/fans/index_search.html
+++ b/app/wechat/view/fans/index_search.html
@@ -13,13 +13,13 @@
             <label class="layui-form-label">订阅状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="subscribe">
-                    {foreach [''=>'-- 全部 --','0'=>'显示未订阅的粉丝','1'=>'显示已订阅的粉丝'] as $k=>$v}
+                    <option value=''>-- 全部 --</option>
+                    {foreach ['显示未订阅的粉丝','显示已订阅的粉丝'] as $k=>$v}
                     {if $k.'' eq input('subscribe')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
             </label>
         </div>
@@ -28,13 +28,13 @@
             <label class="layui-form-label">拉黑状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="is_black">
-                    {foreach [''=>'-- 全部 --','0'=>'显示未拉黑的粉丝','1'=>'显示已拉黑的粉丝'] as $k=>$v}
+                    <option value=''>-- 全部 --</option>
+                    {foreach ['显示未拉黑的粉丝','显示已拉黑的粉丝'] as $k=>$v}
                     {if $k.'' eq input('is_black')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
             </label>
         </div>
diff --git a/app/wechat/view/keys/index.html b/app/wechat/view/keys/index.html
index 0a1ed1eda..e8791863b 100644
--- a/app/wechat/view/keys/index.html
+++ b/app/wechat/view/keys/index.html
@@ -4,6 +4,7 @@
 <!--{if auth("add")}-->
 <button data-open="{:url('add')}" class='layui-btn layui-btn-sm layui-btn-primary'>添加规则</button>
 <!--{/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}-->
@@ -68,9 +69,9 @@
                 <a class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 <!--{/if}-->
 
-                <!--{if $vo.status eq 1 and auth("state")}-->
+                <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0" data-csrf="{:systoken('state')}">禁 用</a>
-                <!--{elseif auth("state")}-->
+                <!--{elseif auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1" data-csrf="{:systoken('state')}">激 活</a>
                 <!--{/if}-->