diff --git a/app/admin/view/Order/order_list.html b/app/admin/view/Order/order_list.html
index b94cd4d..2b0f78b 100644
--- a/app/admin/view/Order/order_list.html
+++ b/app/admin/view/Order/order_list.html
@@ -2,75 +2,82 @@
 
 <div class="layui-fluid">
     <div class="layui-card">
-       
-        <div class="layui-card-body" >
+
+        <div class="layui-card-body">
             <!-- 搜索条件 -->
-           <div id="order-list-body">
-            <form class="layui-form layui-form-pane">
-                <div class="layui-form-item">
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 120px;">
-                            <input type="text" name="user_id" placeholder="用户ID" autocomplete="off" class="layui-input">
+            <div id="order-list-body">
+                <form class="layui-form layui-form-pane">
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 120px;">
+                                <input type="text" name="user_id" placeholder="用户ID" autocomplete="off"
+                                    class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 120px;">
+                                <input type="text" name="mobile" placeholder="手机号" autocomplete="off"
+                                    class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 180px;">
+                                <input type="text" name="order_num" placeholder="订单号" autocomplete="off"
+                                    class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 100px;">
+                                <select name="status">
+                                    <option value="">支付状态</option>
+                                    <option value="0">未支付</option>
+                                    <option value="1">已支付</option>
+                                    <option value="2">已失效</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 100px;">
+                                <select name="istest">
+                                    <option value="">账号类型-全部</option>
+                                    <option value="0" >正常</option>
+                                    <option value="1">推广</option>
+                                    <option value="2">测试</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 100px;">
+                                <select name="u_status">
+                                    <option value="">账号状态-全部</option>
+                                    <option value="1">正常</option>
+                                    <option value="2">封号</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <div class="layui-input-inline" style="width: 160px;">
+                                <input type="text" name="start_time" id="start_time" placeholder="开始时间"
+                                    autocomplete="off" class="layui-input">
+                            </div>
+                            <div class="layui-form-mid">-</div>
+                            <div class="layui-input-inline" style="width: 160px;">
+                                <input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off"
+                                    class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <button class="layui-btn" lay-submit lay-filter="search-order">
+                                <i class="layui-icon layui-icon-search"></i> 搜索
+                            </button>
+                            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                            <button type="button" class="layui-btn layui-btn-normal" id="export-order">
+                                <i class="layui-icon layui-icon-export"></i> 导出Excel
+                            </button>
                         </div>
                     </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 120px;">
-                            <input type="text" name="mobile" placeholder="手机号" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 180px;">
-                            <input type="text" name="order_num" placeholder="订单号" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 100px;">
-                            <select name="status">
-                                <option value="">支付状态</option>
-                                <option value="0">未支付</option>
-                                <option value="1">已支付</option>
-                                <option value="2">已失效</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 100px;">
-                            <select name="istest">
-                                <option value="0">账号类型</option>
-                                <option value="1">推广</option>
-                                <option value="2">测试</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 100px;">
-                            <select name="u_status">
-                                <option value="1">用户状态</option>
-                                <option value="2">封号</option>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline" style="width: 160px;">
-                            <input type="text" name="start_time" id="start_time" placeholder="开始时间" autocomplete="off" class="layui-input">
-                        </div>
-                        <div class="layui-form-mid">-</div>
-                        <div class="layui-input-inline" style="width: 160px;">
-                            <input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <button class="layui-btn" lay-submit lay-filter="search-order">
-                            <i class="layui-icon layui-icon-search"></i> 搜索
-                        </button>
-                        <button type="reset" class="layui-btn layui-btn-primary">重置</button>
-                        <button type="button" class="layui-btn layui-btn-normal" id="export-order">
-                            <i class="layui-icon layui-icon-export"></i> 导出Excel
-                        </button>
-                    </div>
-                </div>
-            </form>
-           </div>
+                </form>
+            </div>
 
             <!-- 数据表格 -->
             <table id="order-table" lay-filter="order-table"></table>
@@ -213,7 +220,7 @@
             elem: '#order-table',
             url: "{:url('get_order_list')}",
             page: true,
-            height: 'full-'+($("#order-list-body").height()+40),
+            height: 'full-' + ($("#order-list-body").height() + 40),
             lineStyle: 'height:170px',
             limit: 10,
             limits: [10, 20, 50, 100],
@@ -257,7 +264,7 @@
             if (obj.event === 'detail') {
                 // 弹出订单详情窗口
                 layer.open({
-                    type: 2, 
+                    type: 2,
                     title: '订单详情',
                     area: ['90%', '90%'],
                     content: "/admin/buy_order_detail?id=" + data.id, // iframe的url
@@ -267,7 +274,7 @@
             } else if (obj.event === 'prize_log') {
                 // 查看抽奖日志
                 layer.open({
-                    type: 2, 
+                    type: 2,
                     title: '操作日志',
                     area: ['90%', '90%'],
                     content: "/admin/markdown/order_info?goods_id=" + data.goods_id + "&order_num=" + data.order_num,
@@ -278,7 +285,7 @@
         });
 
         // 导出Excel
-        $('#export-order').on('click', function() {
+        $('#export-order').on('click', function () {
             var formData = $('.layui-form').serialize();
             window.location.href = "{:url('export_order_list')}?" + formData;
         });