Merge branch 'test'

application/api_broker/controller/HomePageLog.php

@@ -269,11 +269,11 @@ class HomePageLog extends Basic
             $result[$key]['internal_title'] = $res_a[0]['internal_title'];
 
         }
-        $count = $this->gHouseFollowUpModel->getSearchCount( $where_);
+        //$count = $this->gHouseFollowUpModel->getSearchCount( $where_);
         if (count($result) > 0) {
             $list["result"]   = $result;
             $list["img_path"] = AGENTHEADERIMGURL;
-            $list["total"]    = $count;
+            $list["total"]    = 0;
             return $this->response("200", "request success", $list);
         } else {
             return $this->response("200", "request null");

application/api_broker/service/CallPhoneService.php

@@ -564,7 +564,7 @@ class CallPhoneService
         $start_time = $end_time - 3600;
 
         $save_follow['content'] = '拨打电话，未打跟进。';
-        $follow_where['create_time'] = $bind_where['create_time'] = [
+        $follow_where['call_time'] = $bind_where['create_time'] = [
             'between', [date('Y-m-d H:i:s', $start_time), date('Y-m-d H:i:s',$end_time)]
         ];
         $bind_where['time'] = ['>', 0];

application/index/extend/Basic.php

@@ -77,7 +77,8 @@ class Basic extends Controller
         'index/userDetail',
         'index/getSystemMessageByUser',
         'index/userModalList',
-        'index/mainIndex'
+        'index/mainIndex',
+        'index/uploadImg'
     );
 
     /**

public/resource/js/houseFollowUp.js

@@ -249,7 +249,9 @@ define(['doT', 'text!temp/followHouseUp_template_tpl.html', 'css!style/home.css'
 							var doTtmpl = doT.template(document.getElementById('followHouseUp_list_tpl').innerHTML);
 							$("#follow_list").html(doTtmpl(data.data.result));
 							/*分页代码*/
-							add_page(data.data.total, pageNo, house.pageSize, house.getList);
+							add_page(40000, pageNo, house.pageSize, house.getList);
+			                $('.hide-total-info-liu').hide();
+							
 						} else {
 							alert(data['msg']);
 						};