Merge branch 'master' of http://git.house365.com/zhangkuanguang/fenzhan_agent

new_admincp/applications/models/zsb_api_model.php

@@ -3,7 +3,7 @@
 class zsb_api_model extends MY_Model{
 
 
-	private $host = 'http://newrentt.house365.com';
+	private $host = 'http://newrent.house365.com';
 	private $apiSource = 'PC';// 访问API使用的公用source
 	private $apiVersion = '1.0.0';// 访问API使用的公用版本号
 	private $token = 'ZSB_API';

new_admincp/applications/zsb/controllers/sell.php

@@ -2225,6 +2225,7 @@ class Sell extends MY_Controller {
         $realHouseNum = $this->real_house_model->getUidRealHouseNum($uid);
 	    $infotype = $house_detail['infotype'];
 		$is_show_real = 0;
+
         if($is_open_real_house &&  $realNumLimit >0  && $realHouseNum <=$realNumLimit && in_array($infotype,array(1,2))){
 	        $is_show_real = 1;
         }
@@ -2618,7 +2619,8 @@ class Sell extends MY_Controller {
         }
         $this->load->model('real_house_model');
 
-        $fields_values['is_real_house'] = $real_house_set;
+        //$fields_values['is_real_house'] = $real_house_set;
+
         $isRealHouse =$this->real_house_model->getInfoByRowid($house_id);
         $isRealHouseNew =$this->real_house_model->get_real_house_sell_info($house_id);
         //print_r($isRealHouseNew[0]['is_real_house']);die;

new_admincp/applications/zsb/models/broker_model.php

@@ -998,13 +998,14 @@ class Broker_model extends Broker_base_model {
 		    if(GB_CITY == 'nj'){
                 $this->db->select('usetime,starlevel,freeze_num,upgrade_time,mistake_time,real_status,package_id');
             }else{
-                $this->db->select('usetime,starlevel,freeze_num,upgrade_time,mistake_time,package_id');
+                $this->db->select('usetime,starlevel,freeze_num,upgrade_time,mistake_time,package_id,real_status');
             }
 		}
        $cond_where = "uid = '".$uid."'";
        $this->db->where( $cond_where );
 	  
-       $arr_data = $this->db->get('broker')->result_array();  
+       $arr_data = $this->db->get('broker')->result_array();
+
 	   //print_r($arr_data);die;
 
 
@@ -1066,7 +1067,8 @@ class Broker_model extends Broker_base_model {
 		$arr_data['0']['next_update_day'] =$next_update_day;
 		$arr_data['0']['distance_month'] =$distance_month;
 		$arr_data['0']['distance_days'] =$distance_days;
-        $arr_data['0']['package_id'] =$arr_data['0']['package_id'];
+	    $arr_data['0']['package_id'] =$arr_data['0']['package_id'];
+	    $arr_data['0']['real_status'] =$arr_data['0']['real_status'];
 
 		//print_r($arr_data);die;
 	    return $arr_data;