1

application/index/controller/LookShop.php

@@ -294,7 +294,7 @@ class LookShop extends Basic
             $upNum = $this->lookShopService_->getAgentUpNum($item["agent_id"]); //已升级次数
 
             $agentList[$key]["is_upgrade"]   = $upNum;
-            $agentList[$key]["can_look_num"] = $lookNum * $upNum;
+            $agentList[$key]["can_look_num"] = $lookNum * ($upNum + 1);
             $agentList[$key]["name"]         = $arr[0]["name"];
             $agentList[$key]["phone"]        = $arr[0]["phone"];
 

application/index/view/look_shop/whitelist.html

 {layout name="global/frame_two_tpl" /}
-<input type="hidden" class="page-load" id="whitelist" />
+<input type="hidden" class="page-load" id="whitelist"/>
 
 <!--导航star-->
 
@@ -18,24 +18,34 @@
                         <div class="pull-right">
                             <ul class="bread_btn">
                                 <li>
-                                    <a href="#modal-add-do" data-toggle="modal" id="add_whitelist" class="btn btn-default"><i class="icon-plus"></i>
+                                    <a href="#modal-add-do" data-toggle="modal" id="add_whitelist"
+                                       class="btn btn-default"><i class="icon-plus"></i>
                                         新增白名单</a>
                                 </li>
                             </ul>
                         </div>
                     </div>
 
-                    <div style="width:50%;margin: 10px">
-                        <input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" id="name" placeholder="经纪人姓名" type="text">
-                        <input class="form-control btn5" data-rule-phoneus="false" data-rule-required="false" id="phone" placeholder="手机号" type="text">
-                        <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
-                        <span class="btn btn-info btn3 ld-Marheight" id="form_search_reset">重置</span>
-                    </div>
+
+
 
                     <div class="panel-body">
                         <div class="table-responsive">
                             <table class="table table-striped table-bordered table-hover">
                                 <thead>
+                                <tr>
+                                    <td colspan="7">
+                                        <form action="" method="get" id="form_search">
+                                            <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="name"
+                                                   placeholder="经纪人姓名" type="text">
+                                            <input class="form-control btn2" data-rule-phoneus="false" data-rule-required="false" id="phone"
+                                                   placeholder="手机号" type="text">
+
+                                            <span class="btn btn-info btn3 ld-Marheight" id="search">搜索</span>
+                                            <span class="btn btn-info btn3 ld-Marheight" id="form_search_reset">重置</span>
+                                        </form>
+                                    </td>
+                                </tr>
                                 <tr>
                                     <th>所在部门</th>
                                     <th>所在门店</th>
@@ -55,7 +65,7 @@
                         </div>
                     </div>
                 </div>
-                <input type="hidden" value="0" id="type" />
+                <input type="hidden" value="0" id="type"/>
             </div>
 
         </div>

public/resource/js/whitelist.js

@@ -37,6 +37,25 @@ define(['doT', 'text!temp/whitelist_template_tpl.html', 'css!style/home.css', 'b
                 whitelist.upLookShop(params);
             });
             $("#search").click(function () {
+                var params = {};
+                var name = $("#name").val();
+                var phone = $("#phone").val();
+                if (name) {
+                    params.name = name;
+                }
+                if (phone && phone.length > 3) {
+                    params.phone = phone;
+                } else if (phone && phone.length <= 3) {
+                    alert("手机号必须输入四位或以上");return;
+                }
+                if(!name && !phone){
+                    alert("请输入搜索条件");return;
+                }
+                whitelist.getWhitelist(params);
+            });
+            $("#form_search_reset").click(function () {
+                $("#name").val("");
+                $("#phone").val("");
                 whitelist.getWhitelist();
             });
 
@@ -121,18 +140,7 @@ define(['doT', 'text!temp/whitelist_template_tpl.html', 'css!style/home.css', 'b
             });
         },
         /*获取 list*/
-        getWhitelist: function () {
-            var params = {};
-            var name = $("#name").val();
-            var phone = $("#phone").val();
-            if (name) {
-                params.name = name;
-            }
-            if (phone && phone.length > 3) {
-                params.phone = phone;
-            }else if(phone && phone.length <= 3){
-                alert("手机号必须输入四位或以上");
-            }
+        getWhitelist: function (params) {
             $.ajax({
                 url: '/admin.php/index/getWhitelist',
                 type: 'get',