合并分支 'subscribe2.0' 到 'release'

线上问题跟踪

查看合并请求 !34

center/controllers/esf_center_api.php

@@ -127,17 +127,15 @@ class Esf_center_api extends MY_Controller {
         $city = $this->input->get('city');
         $city = $city?$city:'nj';
         $tbl=$kind==3?'sell':'rent';
-        $result = $this->user_model->getusercollectid($uid,$rowid,$city);
-        if(isset($_GET['fangliyan']) && $_GET['fangliyan'] == 1){
-            echo '是否已收藏：';
-            print_r($result);exit;
+        if($uid){
+            $result = $this->user_model->getusercollectid($uid,$rowid,$city);
+            //已关注此房源
+            if($result['id']>0)
+            {
+                $return = 'N_COL';
+            }
         }
 
-        //已关注此房源
-        if($result['id']>0)
-        {
-            $return = 'N_COL';
-        }
         if($tbl == 'sell'){
             $houseinfo =  $this->house_model->get_data(array('form_name' => $tbl,'where'=>array('id'=>$rowid,'esta'=>'1'),'select'=>array('infotype','infofrom','id','district','address','streetid','blockshowname','room','hall','buildarea','forward','fitment','buildyear','floor','totalfloor','subfloor','price','uid','telno','pic1','contactor','uid','averprice'),'limit'=>1),'esfhousebak');
         }else{
@@ -973,8 +971,9 @@ class Esf_center_api extends MY_Controller {
     public function api_getsaveblock()
     {
         $telno = $this->input->get('telno');
-        $base_id = $this->input->get('base_id');
-        if(!$base_id)
+        $uid = $this->user_model->yztelno($telno);
+
+        if($uid==0)
         {
             echo serialize(array());exit;
         }
@@ -986,8 +985,8 @@ class Esf_center_api extends MY_Controller {
         $page = $page ? $page:1;
         $pagesize = $pagesize?$pagesize : 20;
         $offset = $pagesize * ($page-1);
-        $collect_array = $this->user_model->getcollectByBaseId($kind,$base_id,$offset,$pagesize,$city);
 
+        $collect_array = $this->user_model->getcollect($kind,$uid,$offset,$pagesize,$city);
         if(!empty($collect_array) && is_array($collect_array))
         {
             foreach($collect_array as $key=>$value)