后台新增功能

application/index/view/marchin/marchin_list.html

@@ -65,7 +65,8 @@
 												<select class="form-control btn4 ld-Marheight input" name="" id="guest_stores"  value="">
 
 												</select>
-                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_name" placeholder="客户姓名" type="text" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_id" placeholder="客户ID" type="text" value="">
+                                            <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="shop_id" placeholder="商铺ID" type="text" value="">
                                             <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="user_phone" placeholder="客户手机号" type="text" value="">
                                               <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="report_agent_name" placeholder="报备人姓名" type="text" value="">
                                               <input class="form-control btn2 ld-Marheight" data-rule-phoneus="false" data-rule-required="false" id="report_agent_phone" placeholder="报备人手机号" type="text" value="">

public/resource/js/marchinList.js

@@ -167,13 +167,16 @@ define(['doT', 'css!style/home.css',  'ckfinder', 'ckfinderStart', "datetimepick
             params.create_time_end =$('#create_time_end').val();
             params.district_id =$('#district_id').val()*1;
             params.store_id =$('#guest_stores').val()*1;
-            params.user_name =$('#user_name').val();
+//          params.user_name =$('#user_name').val();
             params.user_phone =$('#user_phone').val();//跟进搜索
             params.report_agent_phone =$('#report_agent_phone').val();
             params.report_agent_name =$('#report_agent_name').val();
             params.house_title =$('#house_title').val();
             params.shop_type =$('#shop_type').val()*1;//跟进搜索
             params.order_id =$('#bargain_id').val()*1;//带看订单ID搜索
+            params.user_id =$('#user_id').val();
+            params.house_id =$('#shop_id').val();
+            
             params.pageNo = follow.pageNo;
             params.pageSize = follow.pageSize;
 			$.ajax({

public/resource/template/house_template_tpl.html

@@ -107,7 +107,7 @@
             [% } %]
 
             [% if(check_auth('index/houseDel')) { %]
-                <a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">删除</a>
+                <a data-toggle="modal" data-id='[%= it[item]["id"] %]' href="#modal-delete" class="btn1 btn-danger add_applies del_modal btn-default-hide-display">无效</a>
             [% } %]
             [% if(check_auth('index/vipHouse')) { %]
 	            <a class="btn1 is_vip_plate btn-default-hide-display [%= sw3(it[item]['is_vip']) %]" data-toggle="modal" data-id='[%= it[item]["id"] %]'>