diff --git a/app/admin/view/merchant/system/merchant/margin/list.html b/app/admin/view/merchant/system/merchant/margin/list.html
index a187ae9..a905bcf 100644
--- a/app/admin/view/merchant/system/merchant/margin/list.html
+++ b/app/admin/view/merchant/system/merchant/margin/list.html
@@ -13,7 +13,22 @@
             <div class="layui-form-item">
 
                 <div class="layui-inline">
-                    <label class="layui-form-label">日期范围</label>
+                    <label class="layui-form-label">选择时间</label>
+                    <div class="layui-input-block">
+                        <div class="layui-btn-group" id="witch_date">
+                            <button type="button" class="layui-btn layui-btn-normal">全部</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
+                            <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="layui-inline">
+                    <!-- <label class="layui-form-label">日期范围</label> -->
                     <div class="layui-inline" id="test6">
                         <div class="layui-input-inline">
                             <input type="text" autocomplete="off" id="test-startDate-1" class="layui-input"
@@ -27,29 +42,44 @@
                     </div>
                 </div>
 
-                <div class="layui-inline" style="width:45%">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">关键字</label>
-                        <div class="layui-input-block">
-                            <input style="width:70%;float:left" type="text" name="keywords" placeholder="请输入关键字"
-                                class="layui-input" autocomplete="off" />
-                            <button class="layui-btn layui-btn-normal" lay-submit=""
-                                lay-filter="searchform">提交搜索</button>
-                        </div>
-                    </div>
-
-                </div>
-
             </div>
 
             <div class="layui-form-item">
 
+                <div class="layui-inline" style="width:46%">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">关键字</label>
+                        <div class="layui-input-block">
+                            <input style="width:80%;float:left" type="text" name="keywords" placeholder="请输入关键字"
+                                class="layui-input" autocomplete="off" />
+                            <button class="layui-btn layui-btn-normal"  style="width:20%" lay-submit=""
+                                lay-filter="searchform" type="button">提交搜索</button>
+                        </div>
+                    </div>
+                </div>
 
                 <div class="layui-input-inline" style="width:35%;float:none;">
                     <div class="layui-form-item">
                         <label class="layui-form-label">商户类别</label>
                         <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
+                            <select name="dddd" lay-filter="searchform">
+                                <option value=""></option>
+                                <option value="10">自营</option>
+                                <option value="11">非自营</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            <div class="layui-form-item">
+
+                <div class="layui-input-inline" style="width:46%;">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">商户分类</label>
+                        <div class="layui-input-block">
+                            <select name="category" lay-filter="searchform">
                                 <option value=""></option>
                                 <option value="0">写作</option>
                                 <option value="1">阅读</option>
@@ -63,9 +93,9 @@
 
                 <div class="layui-input-inline" style="width:35%;">
                     <div class="layui-form-item">
-                        <label class="layui-form-label">商户分类</label>
+                        <label class="layui-form-label">店铺类型</label>
                         <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
+                            <select name="type" lay-filter="type">
                                 <option value=""></option>
                                 <option value="0">写作</option>
                                 <option value="1">阅读</option>
@@ -79,31 +109,14 @@
 
             </div>
 
-            <div class="layui-form-item">
-
-
-                <div class="layui-input-inline" style="width:35%;">
-                    <div class="layui-form-item">
-                        <label class="layui-form-label">店铺类型</label>
-                        <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
-                                <option value=""></option>
-                                <option value="0">写作</option>
-                                <option value="1">阅读</option>
-                                <option value="2">游戏</option>
-                                <option value="3">音乐</option>
-                                <option value="4">旅行</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="layui-input-inline" style="width:35%;">
+            <!-- change tab -->
+            <div class="layui-form-item" id="set_margin" style="display:block;">
+                <div class="layui-input-inline"  style="width:46%;">
                     <div class="layui-form-item">
 
                         <label class="layui-form-label">保证金状态</label>
                         <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
+                            <select name="status" lay-filter="status">
                                 <option value=""></option>
                                 <option value="0">写作</option>
                                 <option value="1">阅读</option>
@@ -113,20 +126,48 @@
                             </select>
                         </div>
 
-                        <div class="layui-tab" lay-filter="demo" lay-allowclose="true">
-                            <ul class="layui-tab-title">
-                              <li class="layui-this" lay-id="11"></li>
-                              <li lay-id="22"></li>
-                            </ul>
-                            <div class="layui-tab-content">
-                              <div class="layui-this" lay-id="11"  class="layui-tab-item layui-show">内容1</div>
-                              <div lay-id="22" class="layui-tab-item">内容2</div>
+                    </div>
+                </div>
+            </div>
+            <!-- change tab end -->
+
+            <!-- change tab -->
+            <div class="layui-form-item" id="refund_margin" style="display:none;">
+
+                <div class="layui-input-inline"  style="width:46%;">
+                    <div class="layui-form-item">
+
+                        <label class="layui-form-label">审核</label>
+                        <div class="layui-input-block">
+                            <div class="layui-btn-group">
+                                <button type="button" class="layui-btn layui-btn-normal">全部</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">已审核</button>
+                                <button type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核失败</button>
                             </div>
                         </div>
 
                     </div>
                 </div>
 
+                <div class="layui-input-inline"  style="width:35%;">
+                    <div class="layui-form-item">
+
+                        <label class="layui-form-label">退回状态</label>
+                        <div class="layui-input-block">
+                            <select name="refund" lay-filter="refund">
+                                <option value=""></option>
+                                <option value="0">写作</option>
+                                <option value="1">阅读</option>
+                                <option value="2">游戏</option>
+                                <option value="3">音乐</option>
+                                <option value="4">旅行</option>
+                            </select>
+                        </div>
+
+
+                    </div>
+                </div>
             </div>
         </form>
     </div>
@@ -164,7 +205,7 @@
 
 </div>
 
-<!-- 操作 -->
+<!-- 缴存操作 -->
 <script type="text/html" id="toolbarDemo"></script>
 <script type="text/html" id="barDemo">
     <div class="layui-btn-group">
@@ -173,7 +214,7 @@
     </div>
 </script>
 
-<!-- 操作 -->
+<!-- 退回操作 -->
 <script type="text/html" id="refundToolbar"></script>
 <script type="text/html" id="refundBar">
     <div class="layui-btn-group">
@@ -360,6 +401,7 @@
 
         //监听搜索提交
         form.on('submit(searchform)', function(data) {
+            console.log(data.field);
         	layui.pageTable.reload({
         		where: {
         			keywords: data.field.keywords
@@ -368,75 +410,88 @@
         			curr: 1
         		}
         	});
+            // layui.form.render();
+        	return false;
+        });
+        form.on('select(searchform)', function(data) {
+            console.log(data.elem.name);
+        	layui.pageTable.reload({
+        		where: {
+        			// keywords: data.field.category
+        		},
+        		page: {
+        			curr: 1
+        		}
+        	});
         	return false;
         });
 
         // 日期范围
-        layui.use(['laydate','element'], function () {
-            var laydate = layui.laydate;
-            var $ = layui.jquery,element = layui.element;
-            //日期范围
-            laydate.render({
-                elem: '#test6'
-                //设置开始日期、日期日期的 input 选择器
-                //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
-                , range: ['#test-startDate-1', '#test-endDate-1']
-                ,done: function(value, date, endDate){
-                    if (value) {
-                        // 时间选择
-                        console.log(value); //得到日期生成的值，如：2017-08-18
-                        console.log(date); //得到日期时间对象：{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
-                        console.log(endDate); //得结束的日期时间对象，开启范围选择（range: true）才会返回。对象成员同上。
-                        alert(1);
+        layui.use(['laydate','element', 'jquery'], 
+            function () {
+                var laydate = layui.laydate;
+                var $ = layui.jquery,element = layui.element;
+                //日期范围
+                laydate.render({
+                    elem: '#test6'
+                    //设置开始日期、日期日期的 input 选择器
+                    //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
+                    , range: ['#test-startDate-1', '#test-endDate-1']
+                    ,done: function(value, date, endDate){
+                        if (value) {
+                            // 时间选择
+                            console.log(value); //得到日期生成的值，如：2017-08-18
+                            console.log(date); //得到日期时间对象：{year: 2017, month: 8, date: 18, hours: 0, minutes: 0, seconds: 0}
+                            console.log(endDate); //得结束的日期时间对象，开启范围选择（range: true）才会返回。对象成员同上。
 
-                        layui.pageTable.reload({
-                            where: {
-                                keywords: data.field.keywords
-                            },
-                            page: {
-                                curr: 1
-                            }
-                        });
-                    } else {
-                        // 重置
+                            layui.pageTable.reload({
+                                where: {
+                                    keywords: data.field.keywords
+                                },
+                                page: {
+                                    curr: 1
+                                }
+                            });
+                        } else {
+                            // 重置
+                        }
                     }
-                }
-            });
+                });
 
-            //触发事件
-            var active = {
-                tabChange: function(){
-                    //切换到指定Tab项
-                    element.tabChange('demo', this.getAttribute('lay-id')); //切换到：用户管理
-                    // 展示
-                    this.getAttribute()
-                    // 删除
-                }
-            };
-            
-            $('.site-demo-active').on('click', function(){
-                var othis = $(this), type = othis.data('type');
-                active[type] ? active[type].call(this, othis) : '';
-            });
-            
-            //Hash地址的定位
-            // var layid = location.hash.replace(/^#test=/, '');
-            // element.tabChange('test', layid);
-        });
+                //触发事件
+                var active = {
+                    tabChange: function(){
+                        //切换到指定Tab项
+                        // element.tabChange('demo', this.getAttribute('lay-id')); //切换tab
+                        var marign = document.getElementById('set_margin');
+                        var refund = document.getElementById('refund_margin');
+                        if ('11'==this.getAttribute('lay-id')) {
+                            marign.style.display = "block";
+                            refund.style.display = "none";
+                        }else{
+                            refund.style.display = "block";
+                            marign.style.display = "none";
+                        }
+                    }
+                };
+                
+                $('.site-demo-active').on('click', function(){
+                    var othis = $(this), type = othis.data('type');
+                    active[type] ? active[type].call(this, othis) : '';
+                });
+                
+                //Hash地址的定位
+                // var layid = location.hash.replace(/^#test=/, '');
+                // element.tabChange('test', layid);
 
-
-        // table.on('laydate', function (obj) {
-        //     if (obj.event === 'add') {
-        //         tool.side("/admin/merchant/type/form");
-        //         return false;
-        //     }
-        // });
-
-
-            
-        
+            }
+        );
      
     }
+
+    function get_params() {
+        
+    }
 </script>
 {/block}
 <!-- /脚本 -->
\ No newline at end of file