渠道bug修改

html/application/controllers/admin/report.php

@@ -345,7 +345,7 @@ class Report extends CI_Controller
 	{
 		$post = $this->input->post();
 		$this->load->model('report_log_model', 'report');
-		//$this->load->model('customer_building_log_model', 'customer_building_log');
+		$this->load->model('customer_building_log_model', 'customer_building_log');
 		$this->load->model('customer_building_eas_model', 'customer_building_eas');
 		$this->load->model('recommend_trace_model', 'recommend');
 		$this->load->model('customer_model','customer');

html/application/controllers/channel/index.php

@@ -300,6 +300,7 @@ class Index extends CI_Controller{
 			$this->data['sales_name']=$sales['true_name'];
 			$this->data['sales_mobile']=$sales['user_mobile'];
 		}
+	 
 		$this->data['feedbacks']=$feedbacks;
 		$this->data['entity']=$query;
 		$this->data['datestring']=$datestring;

html/application/models/customer_building_model.php

@@ -268,7 +268,7 @@ class Customer_building_model extends MY_Model{
     	->from('tb_customer_building_log CB')
     	->join('tb_building B', 'B.id= CB.building_id', 'left')
     	->join('tb_customer TC', 'TC.id = CB.customer_id', 'left')
-    	->join('tb_user US', 'US.id= in(."CB.sale_id".)', 'left')
+    	->join('tb_user US', 'US.id= CB.sale_id', 'left')
     	->join('tb_user UM', 'UM.id = CB.manager_id', 'left')
     	->join('tb_user UU', 'UU.id = CB.user_id', 'left')
     	->join('tb_distributor D', 'D.uniqid_id=UU.uniqid_id', 'left');
@@ -548,11 +548,12 @@ class Customer_building_model extends MY_Model{
 	*获取某种状态下的客户里报表。分销商用
 	*/
 	public function get_custormer_list_byStatus($where=NULL, $page = 1, $page_size = 0){
-		$this->db->select('CB.id cbid,CB.create_time,CB.sale_id,C.customer_user,C.customer_mobile,U.user_name,B.building_title,D.id idd,D.company_name,M.manager_name,R.region_name,CB.recommend_status')
+		$this->db->select('CB.id cbid,CB.create_time,CS.sale_id,C.customer_user,C.customer_mobile,U.user_name,B.building_title,D.id idd,D.company_name,M.manager_name,R.region_name,U.user_mobile user_mobile,CB.recommend_status')
 			 ->from('tb_customer_building CB')
 			 ->join('tb_customer C','C.id=CB.customer_id','left')
 			 ->join('tb_building B','B.id=CB.building_id','left')
-			 ->join('tb_user U','U.id=CB.user_id','left')
+			 ->join('tb_customer_sales CS','CS.customer_building_id = CB.id')
+			 ->join('tb_user U','U.id=CS.sale_id','left')
 			 ->join('tb_distributor D','D.id=CB.distributor_id')
 			 ->join('tb_channel CH','CH.id=D.channel_id')
 			 ->join('tb_manager M','M.id=CH.manager_id')

html/application/views/channel/follow.php

@@ -92,7 +92,7 @@
           <?php if($counts>=2) {?>
             <div class="li-div step-two">
               <div class="left">到访看房</div>
-              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[0]['create_time'])?></div>
+              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[1]['create_time'])?></div>
               <div class="clearf"></div>
               <div style="color: #999; font-size: 12px;margin-top: 4px;">
                 <?php echo (isset($feedbacks[2]['remark']) && $feedbacks[2]['remark']!="")? $feedbacks[2]['remark']:"" ?>
@@ -112,7 +112,7 @@
           <?php if($counts>=3) {?>
             <div class="li-div step-three">
               <div class="left">已认购</div>
-              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[3]['create_time'])?></div>
+              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[1]['create_time'])?></div>
               <div class="clearf"></div>
              <div style="color: #999; font-size: 12px;margin-top: 4px;">
                 <?php echo (isset($feedbacks[3]['remark']) && $feedbacks[3]['remark']!="")? $feedbacks[3]['remark']:"" ?>
@@ -132,7 +132,7 @@
           <?php if($counts>=4){?>
             <div class="li-div step-four">
               <div class="left">已签约</div>
-              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[4]['create_time'])?></div>
+              <div class="right div-time"><?php echo mdate($dateformat,$feedbacks[1]['create_time'])?></div>
               <div class="clearf"></div>
             </div>
             <div class="li-circle curr"></div>