diff --git a/app/data/view/news_item/index.html b/app/data/view/news_item/index.html
index 3dd8c398d..74462a9ff 100644
--- a/app/data/view/news_item/index.html
+++ b/app/data/view/news_item/index.html
@@ -58,9 +58,7 @@
 
                 <!--{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">禁 用</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{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">激 活</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/news_mark/index.html b/app/data/view/news_mark/index.html
index 25b74a7da..3d725297f 100644
--- a/app/data/view/news_mark/index.html
+++ b/app/data/view/news_mark/index.html
@@ -33,18 +33,19 @@
             <td>{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">已激活</span>{/if}</td>
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
             <td class='text-left nowrap'>
-                {if auth("edit")}
+                <!--{if auth("edit")}-->
                 <a data-dbclick class="layui-btn layui-btn-sm" data-width="500px" data-title="编辑标签" data-modal="{:url('edit')}?id={$vo.id}">编 辑</a>
-                {/if}
-                {if auth("state") and $vo.status eq 1}
+                <!--{/if}-->
+
+                <!--{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">禁 用</a>
-                {/if}
-                {if auth("state") and $vo.status eq 0}
+                <!--{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">激 活</a>
-                {/if}
-                {if auth("remove")}
+                <!--{/if}-->
+
+                <!--{if auth("remove")}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除该标签吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
-                {/if}
+                <!--{/if}-->
             </td>
         </tr>
         {/foreach}
diff --git a/app/data/view/payment/index_search.html b/app/data/view/payment/index_search.html
index c4984ce9d..d765b13a8 100644
--- a/app/data/view/payment/index_search.html
+++ b/app/data/view/payment/index_search.html
@@ -7,6 +7,7 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入通道名称" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付方式</label>
             <div class="layui-input-inline">
@@ -21,6 +22,7 @@
                 </select>
             </div>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">使用状态</label>
             <div class="layui-input-inline">
@@ -34,12 +36,14 @@
                 </select>
             </div>
         </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('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/data/view/shop_goods_mark/index.html b/app/data/view/shop_goods_mark/index.html
index d6637d05b..1faf0fbcc 100644
--- a/app/data/view/shop_goods_mark/index.html
+++ b/app/data/view/shop_goods_mark/index.html
@@ -40,9 +40,7 @@
 
                 <!--{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">禁 用</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{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">激 活</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/shop_order/index_search.html b/app/data/view/shop_order/index_search.html
index 2bc46c2b2..0c6779c01 100644
--- a/app/data/view/shop_order/index_search.html
+++ b/app/data/view/shop_order/index_search.html
@@ -48,7 +48,7 @@
             <label class="layui-form-label">订单状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    <option value=''>- 全部订单 -</option>
+                    <option value=''>- 全部状态 -</option>
                     {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
@@ -63,8 +63,8 @@
             <label class="layui-form-label">付款状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="payment_status">
-                    <option value=''>- 全部订单 -</option>
-                    {foreach ['0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
+                    <option value=''>- 全部状态 -</option>
+                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
                     {if input('payment_status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
diff --git a/app/data/view/shop_order/truck.html b/app/data/view/shop_order/truck.html
index f16f35d7e..65c1739bd 100644
--- a/app/data/view/shop_order/truck.html
+++ b/app/data/view/shop_order/truck.html
@@ -55,24 +55,27 @@
             </label>
         </fieldset>
     </div>
+
     <div class="hr-line-dashed"></div>
     {notempty name='vo.order_no'}<input type='hidden' value='{$vo.order_no}' name='order_no'>{/notempty}
     {notempty name='vo.send_datetime'}<input type='hidden' value='{$vo.send_datetime}' name='send_datetime'>{/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>
     </div>
-    <script>
-        require(['pcasunzips'], function () {
-            (function (province, city, area) {
-                new PCAS("form_province", "form_city", "form_area", province, city, area);
-                window.form.render();
-            })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
-        });
-        $('[data-express-query]').on('click', function () {
-            (function (code, number) {
-                $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
-            })($('[data-truck-code]').val(), $('[data-truck-number]').val());
-        });
-    </script>
-</form>
\ No newline at end of file
+</form>
+
+<script>
+    require(['pcasunzips'], function () {
+        (function (province, city, area) {
+            new PCAS("form_province", "form_city", "form_area", province, city, area);
+            window.form.render();
+        })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
+    });
+    $('[data-express-query]').on('click', function () {
+        (function (code, number) {
+            $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
+        })($('[data-truck-code]').val(), $('[data-truck-number]').val());
+    });
+</script>
\ No newline at end of file
diff --git a/app/data/view/shop_order_service/index_search.html b/app/data/view/shop_order_service/index_search.html
index 155531217..c18cfcb66 100644
--- a/app/data/view/shop_order_service/index_search.html
+++ b/app/data/view/shop_order_service/index_search.html
@@ -7,41 +7,48 @@
                 <input name="member_phone" value="{:input('member_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="member_nickname" value="{:input('member_nickname')}" 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="agent_phone" value="{:input('agent_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="agent_nickname" value="{:input('agent_nickname')}" 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="order_no" value="{:input('order_no')}" 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="express_send_no" value="{:input('express_send_no')}" placeholder="请输入发货单号" class="layui-input">
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="status">
-                    {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
+                    <option value=''>- 全部状态 -</option>
+                    {foreach ['2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -50,11 +57,13 @@
                 </select>
             </label>
         </div>
+
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">付款状态</label>
             <label class="layui-input-inline">
                 <select class="layui-select" name="pay_state">
-                    {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
+                    <option value=''>- 全部状态 -</option>
+                    {foreach ['未支付的订单','已支付的订单'] as $k=>$v}
                     {if input('pay_state') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -63,54 +72,63 @@
                 </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="create_at" value="{:input('create_at')}" 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="pay_datetime" value="{:input('pay_datetime')}" 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="express_name" value="{:input('express_name')}" 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="express_phone" value="{:input('express_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="express_province" value="{:input('express_province')}" 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="express_city" value="{:input('express_city')}" 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="express_area" value="{:input('express_area')}" 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="express_address" value="{:input('express_address')}" 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/data/view/shop_truck_company/index.html b/app/data/view/shop_truck_company/index.html
index cd74e1649..4b8457955 100644
--- a/app/data/view/shop_truck_company/index.html
+++ b/app/data/view/shop_truck_company/index.html
@@ -69,11 +69,13 @@
                     <!--{if auth("edit") and $type eq 'index'}-->
                     <a data-dbclick class="layui-btn layui-btn-sm" data-title="编辑快递公司" data-modal='{: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-warm layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
-                    <!--{elseif auth("state")}-->
+                    <!--{elseif auth("state") and $vo.status eq 0}-->
                     <a class="layui-btn layui-btn-warm layui-btn-sm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
                     <!--{/if}-->
+
                     <!--{if auth("remove") and $type eq 'recycle'}-->
                     <a class="layui-btn layui-btn-danger layui-btn-sm" data-confirm="确定要删除数据吗?" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
                     <!--{/if}-->
diff --git a/app/data/view/shop_truck_company/index_search.html b/app/data/view/shop_truck_company/index_search.html
index 94d06545a..b4c696232 100644
--- a/app/data/view/shop_truck_company/index_search.html
+++ b/app/data/view/shop_truck_company/index_search.html
@@ -7,18 +7,21 @@
                 <input name="name" value="{:input('name','')}" 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="code" value="{:input('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 data-date-range name="create_at" value="{:input('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/data/view/shop_truck_template/form_region.html b/app/data/view/shop_truck_template/form_region.html
index e5e3f608f..a37743964 100644
--- a/app/data/view/shop_truck_template/form_region.html
+++ b/app/data/view/shop_truck_template/form_region.html
@@ -13,6 +13,7 @@
             </div>
         </div>
     </div>
+
     <div class="layui-card border-line">
         <div class="layui-card-header layui-bg-gray border-bottom-line"><b class="color-green" ng-bind="province.name"></b><span class="font-s12 color-desc margin-left-10">配送城市</span></div>
         <div class="layui-card-body">
@@ -21,6 +22,7 @@
             </div>
         </div>
     </div>
+
     <div class="layui-card border-line">
         <div class="layui-card-header layui-bg-gray border-bottom-line"><b class="color-green" ng-bind="city.name"></b><span class="font-s12 color-desc margin-left-10">配送区域</span></div>
         <div class="layui-card-body">
@@ -29,11 +31,13 @@
             </div>
         </div>
     </div>
+
     <div class="hr-line-dashed margin-top-40"></div>
     <div class="layui-form-item text-center">
         <button class="layui-btn" ng-click="Confirm()">确定修改</button>
     </div>
 </div>
+
 <label class="layui-hide">
     <textarea class="layui-textarea" id="RegionData">{$citys|json_encode|raw}</textarea>
 </label>
diff --git a/app/data/view/shop_truck_template/index_search.html b/app/data/view/shop_truck_template/index_search.html
index b4ae831b0..0941b7c59 100644
--- a/app/data/view/shop_truck_template/index_search.html
+++ b/app/data/view/shop_truck_template/index_search.html
@@ -7,22 +7,26 @@
                 <input name="code" value="{:input('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="name" value="{:input('name','')}" 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('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>
     </form>
-    <script>form.render()</script>
-</fieldset>
+
+</fieldset>
+<script>form.render()</script>
 
diff --git a/app/data/view/store_item/form.html b/app/data/view/store_item/form.html
index e75eac2c2..43af590bf 100644
--- a/app/data/view/store_item/form.html
+++ b/app/data/view/store_item/form.html
@@ -6,6 +6,7 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -14,8 +15,10 @@
             </label>
         </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/data/view/store_item/index.html b/app/data/view/store_item/index.html
index c1c53e437..0bd93b7d8 100644
--- a/app/data/view/store_item/index.html
+++ b/app/data/view/store_item/index.html
@@ -49,9 +49,7 @@
 
                 <!--{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">禁 用</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{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">激 活</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/store_item/index_search.html b/app/data/view/store_item/index_search.html
index a764e0445..2665a2e62 100644
--- a/app/data/view/store_item/index_search.html
+++ b/app/data/view/store_item/index_search.html
@@ -7,11 +7,13 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </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 $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -20,12 +22,14 @@
                 </select>
             </div>
         </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('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/data/view/store_used/form.html b/app/data/view/store_used/form.html
index e75eac2c2..43af590bf 100644
--- a/app/data/view/store_used/form.html
+++ b/app/data/view/store_used/form.html
@@ -6,6 +6,7 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -14,8 +15,10 @@
             </label>
         </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/data/view/store_used/index.html b/app/data/view/store_used/index.html
index 822053083..0c05533f4 100644
--- a/app/data/view/store_used/index.html
+++ b/app/data/view/store_used/index.html
@@ -49,9 +49,7 @@
 
                 <!--{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">禁 用</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{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">激 活</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/store_used/index_search.html b/app/data/view/store_used/index_search.html
index a764e0445..2665a2e62 100644
--- a/app/data/view/store_used/index_search.html
+++ b/app/data/view/store_used/index_search.html
@@ -7,11 +7,13 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </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 $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -20,12 +22,14 @@
                 </select>
             </div>
         </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('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/data/view/store_user/form.html b/app/data/view/store_user/form.html
index e75eac2c2..43af590bf 100644
--- a/app/data/view/store_user/form.html
+++ b/app/data/view/store_user/form.html
@@ -6,6 +6,7 @@
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}"/>
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
+
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Mark Remark</span>
@@ -14,8 +15,10 @@
             </label>
         </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/data/view/store_user/index.html b/app/data/view/store_user/index.html
index 40b13b28e..7dce20a02 100644
--- a/app/data/view/store_user/index.html
+++ b/app/data/view/store_user/index.html
@@ -49,9 +49,7 @@
 
                 <!--{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">禁 用</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{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">激 活</a>
                 <!--{/if}-->
 
diff --git a/app/data/view/store_user/index_search.html b/app/data/view/store_user/index_search.html
index a764e0445..2665a2e62 100644
--- a/app/data/view/store_user/index_search.html
+++ b/app/data/view/store_user/index_search.html
@@ -7,11 +7,13 @@
                 <input name="name" value="{:input('name','')}" placeholder="请输入标签名称" class="layui-input">
             </label>
         </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 $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -20,12 +22,14 @@
                 </select>
             </div>
         </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('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/data/view/user/index.html b/app/data/view/user/index.html
index 91d66dd87..19e450cba 100644
--- a/app/data/view/user/index.html
+++ b/app/data/view/user/index.html
@@ -44,9 +44,7 @@
             <td class="nowrap">
                 <!--{if auth("state") and $vo.status eq 1}-->
                 <a class="layui-btn layui-btn-sm layui-btn-danger" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">冻结账号</a>
-                <!--{/if}-->
-
-                <!--{if auth("state") and $vo.status eq 0}-->
+                <!--{elseif auth("state") and $vo.status eq 0}-->
                 <a class="layui-btn layui-btn-sm layui-btn-normal" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">解冻账号</a>
                 <!--{/if}-->
             </td>
diff --git a/app/data/view/user/index_search.html b/app/data/view/user/index_search.html
index 8a59a0293..8705ded35 100644
--- a/app/data/view/user/index_search.html
+++ b/app/data/view/user/index_search.html
@@ -7,17 +7,20 @@
                 <input name="phone" value="{:input('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="username" value="{:input('username')}" placeholder="请输入姓名昵称" class="layui-input">
             </label>
         </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 $k.'' eq input('status')}
                     <option selected value="{$k}">{$v}</option>
                     {else}
@@ -26,16 +29,18 @@
                 </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('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>
             <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
         </div>
     </form>
-    <script>form.render()</script>
-</fieldset>
\ No newline at end of file
+</fieldset>
+<script>form.render()</script>
diff --git a/app/data/view/user_message/config.html b/app/data/view/user_message/config.html
index d9116d56f..2b219e4e4 100644
--- a/app/data/view/user_message/config.html
+++ b/app/data/view/user_message/config.html
@@ -53,6 +53,5 @@
 
         </div>
     </form>
-
 </div>
 {/block}
\ No newline at end of file
diff --git a/app/data/view/user_message/index_search.html b/app/data/view/user_message/index_search.html
index e01d54554..27bd0eb8f 100644
--- a/app/data/view/user_message/index_search.html
+++ b/app/data/view/user_message/index_search.html
@@ -41,5 +41,5 @@
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
-    <script>form.render()</script>
-</fieldset>
\ No newline at end of file
+</fieldset>
+<script>form.render()</script>