diff --git a/app/admin/view/merchant/system/merchant/intention/lst.html b/app/admin/view/merchant/system/merchant/intention/lst.html
index 25f3cc8..8389bb8 100644
--- a/app/admin/view/merchant/system/merchant/intention/lst.html
+++ b/app/admin/view/merchant/system/merchant/intention/lst.html
@@ -9,36 +9,41 @@
     <!-- 时间选择 -->
     <div class="layui-form">
 
-        <form class="layui-form" action="">
+        <form id="filterform" class="layui-form" action="">
             <div class="layui-form-item">
 
-                <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"
-                                placeholder="开始日期">
-                        </div>
-                        <div class="layui-form-mid">-</div>
-                        <div class="layui-input-inline">
-                            <input type="text" autocomplete="off" id="test-endDate-1" class="layui-input"
-                                placeholder="结束日期">
+                <div class="layui-form-item">
+
+                    <div class="layui-inline">
+                        <label class="layui-form-label">选择时间</label>
+                        <div class="layui-input-block">
+                            <div class="layui-btn-group" id="chonse_date">
+                                <input type="hidden" name="chonse_date" value="" disabled placeholder="选择时间">
+                                <button name="both" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal">全部</button>
+                                <button name="today" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">今天</button>
+                                <button name="yeserday" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">昨天</button>
+                                <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近7天</button>
+                                <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">最近30天</button>
+                                <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本月</button>
+                                <button lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">本年</button>
+                            </div>
                         </div>
                     </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 class="layui-inline">
+                        <!-- <label class="layui-form-label">日期范围</label> -->
+                        <div class="layui-inline" id="range_date">
+                            <div class="layui-input-inline">
+                                <input type="text" autocomplete="off" name="start_date" id="test-startDate-1" class="layui-input"
+                                    placeholder="开始日期">
+                            </div>
+                            <div class="layui-form-mid">-</div>
+                            <div class="layui-input-inline">
+                                <input type="text" autocomplete="off" name="end_date" id="test-endDate-1" class="layui-input"
+                                    placeholder="结束日期">
+                            </div>
                         </div>
-                    </div> -->
-
-                </div>
+                    </div>
 
             </div>
 
@@ -47,12 +52,13 @@
                     <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="0">审核通过</option>
-                                <option value="0">审核未通过</option>
-                            </select>
+                            <div class="layui-btn-group" id="store_status">
+                                <input type="hidden" name="status" value="0" disabled placeholder="核审状态值">
+                                <button name="both" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal">全部</button>
+                                <button name="wait_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">待审核</button>
+                                <button name="success_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核通过</button>
+                                <button name="failed_status" lay-submit="" lay-filter="searchform" type="button" class="layui-btn layui-btn-normal layui-btn-primary">审核未通过</button>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -61,7 +67,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">商户分类</label>
                         <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
+                            <select name="mer_cate" lay-filter="aihao">
                                 <option value=""></option>
                                 {volist name="category" key="k" id="vo"}
                                 <option value="0">{$vo.category_name}</option>
@@ -82,7 +88,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">店铺类型</label>
                         <div class="layui-input-block">
-                            <select name="interest" lay-filter="aihao">
+                            <select name="type" lay-filter="aihao">
                                 <option value=""></option>
                                 {volist name="type" key="k" id="vo"}
                                 <option value="0">{$vo.type_name}</option>
@@ -253,29 +259,72 @@
         });
 
 
-        //监听搜索提交
-        // form.on('submit(searchform)', function(data) {
-        // 	layui.pageTable.reload({
-        // 		where: {
-        // 			keywords: data.field.keywords
-        // 		},
-        // 		page: {
-        // 			curr: 1
-        // 		}
-        // 	});
-        // 	return false;
-        // });
 
         // 日期范围
-        layui.use('laydate', function () {
+        layui.use(['laydate','table','element', 'jquery'], function () {
             var laydate = layui.laydate;
             //日期范围
             laydate.render({
-                elem: '#test6'
+                elem: '#range_date'
                 //设置开始日期、日期日期的 input 选择器
                 //数组格式为 2.6.6 开始新增，之前版本直接配置 true 或任意分割字符即可
                 , range: ['#test-startDate-1', '#test-endDate-1']
+                ,done: function(value, date, endDate){
+                    active['reload'] ? active['reload'].call(this) : '';
+                }
             });
+
+
+            // 
+            var $ = layui.$, active = {
+				reload: function(){
+					let dataRload = getformdata();;
+					console.log(dataRload)
+					//执行重载
+					table.reload('intention_list', {
+						page: {
+						curr: 1 //重新从第 1 页开始
+						}
+						,where: {
+							...dataRload
+						}
+					});
+				}
+			};
+			
+
+			//监听button提交
+			form.on('submit(searchform)', function(data) {
+				layui.pageTable.reload({
+					where: {
+						...data.field
+					},
+					page: {
+						curr: 1
+					}
+				});
+				return false;
+			});
+
+			//监听select提交
+			form.on('select(seleform)', function(data) {
+				active['reload'] ? active['reload'].call(this) : '';
+
+				return false;
+			});
+
+
+
+            // 获取表单所有参数
+            function getformdata() {
+                var form = $('#filterform').serializeArray();
+                var data = new Array();
+                for(let i=0;i<form.length; i++){
+                    data[form[i].name] = form[i].value;
+                }
+
+                return data;
+            }
         });
     }
 </script>