Merge branch 'refs/heads/subscribe2.0' into release_dev_107

# Conflicts:
#	esf_core/models/user_model.php

center/controllers/esf_center_api.php

@@ -900,6 +900,25 @@ class Esf_center_api extends MY_Controller {
         echo serialize($return_array);
     }
 
+    /**
+     * 根据base_id获取收藏状态
+     * @author fly
+     */
+    public function get_focus_status_by_baseId()
+    {
+        $base_id =  $this->input->get('base_id');
+        $kind = $this->input->get('kind');
+        $rowid = $this->input->get('rowid');
+        $city = $this->input->get('city');
+        $city = $city?$city:'nj';
+        $result = $this->user_model->getCollectHouseIdByBaseID($base_id,$kind,$rowid,$city);
+        $return_array = array('result'=>0,'msg'=>'未收藏');
+        if(!empty($result))
+        {
+            $return_array = array('result'=>1,'msg'=>'已收藏');
+        }
+        echo serialize($return_array);
+    }
 
 
     /**

esf_core/models/user_model.php

@@ -881,18 +881,18 @@ class User_model extends MY_Model
     /**
      * 通过base_id查询用户关注房源的房源id
      * @param type $base_id
-     * @return string
+     * @return string|array
      */
     function getCollectHouseIdByBaseID($base_id,$kind,$houseid,$city=GB_CITY,$all=0){
         $base_id = explode(',',$base_id);
-        $return =  $this->get_data(array('form_name' => 'personal_collection','where_in'=>array('base_id'=>$base_id),'where'=>array('collect_id'=>$houseid,'city_name'=>$city,'kind'=>$kind),'select'=>array('id')),'esf');
+        $data =  $this->get_data(array('form_name' => 'personal_collection','where_in'=>array('base_id'=>$base_id),'where'=>array('collect_id'=>$houseid,'city_name'=>$city,'kind'=>$kind),'select'=>array('id')),'esf');
 
-        if(!empty($return[0]))
+        if(!empty($data[0]))
         {
             if($all){
-                return $all;
+                return $data;
             }
-            return $return[0];
+            return $data[0];
         }else{
             return 0;
         }