bug

application/api_broker/controller/Broker.php

@@ -274,7 +274,7 @@ class Broker extends Basic
 
         /*$params['content']='跟进内容';//跟进内容
         $params['labels_id']=1;//g_labels表主键
-        $params['user_id']=1;//u_users ID用户表id
+        $params['user_id']=59072;//u_users ID用户表id
         $params['agent_id']=1;//agent表id-当前登录用户id
         $params['type']='1';//0电话跟进   1普通跟进
         $params['user_status']='1';//0电话跟进   1普通跟进*/
@@ -292,7 +292,7 @@ class Broker extends Basic
         $result = $Users->getUserCityInfo($user_id);
         if($result){
             $params['province'] = $result[0]['province'] ? $result[0]['province'] : '上海市';
-            $params['city']     = $result[0]['city']? $result[0]['province'] : '上海市';
+            $params['city']     = $result[0]['city']? $result[0]['city'] : '上海市';
             $params['disc']     = $result[0]['disc']? $result[0]['disc'] : '黄浦区';
         }
 

application/api_broker/controller/HomePageLog.php

@@ -79,22 +79,7 @@ class HomePageLog extends Basic
             }
         }
 
-
-        if (!empty($params["province"]) && !empty($params["province"])) {
-            $where_["f.province"] = $params["province"];
-        }
-
-        if (!empty($params["city"]) && !empty($params["city"])) {
-            $where_["f.city"] = $params["city"];
-        }
-
-        if (!empty($params["disc"]) && !empty($params["disc"])) {
-            $where_["f.disc"] = $params["disc"];
-        }else{
-            $where_["f.city"] = trim($this->city) ? trim($this->city) : '上海市';
-        }
-
-
+        $where_["f.city"] = trim($this->city) ? trim($this->city) : '上海市';
 
         $order = "f.id desc";
 

application/api_broker/controller/Shop.php

@@ -577,6 +577,14 @@ class Shop extends Basic
             || !isset($params["agent_name"]) || !isset($params["agent_phone"])) {
             return $this->response("101", "请求参数错误");
         }
+
+        $result = $this->gHousesModel->getHouseInfo('province,city,disc', [ 'id' => $params["house_id"]]);
+        if($result){
+            $params['province'] = $result[0]['province'] ? $result[0]['province'] : '上海市';
+            $params['city']     = $result[0]['city']? $result[0]['city'] : '上海市';
+            $params['disc']     = $result[0]['disc']? $result[0]['disc'] : '黄浦区';
+        }
+
         $follow_up_model = new GHousesFollowUp();
         $id              = $follow_up_model->addHousesFollowUp($params);
         if ($id > 0) {

application/model/GHouses.php

@@ -1180,4 +1180,6 @@ class GHouses extends BaseModel
         return $result;
 
     }
+
+
 }

application/model/GHousesFollowUp.php

@@ -50,6 +50,19 @@ class GHousesFollowUp extends BaseModel
             $where_['landlord_name'] = $params['landlord_name'];
         }
 
+
+        if (isset($params["province"])) {
+            $where_["province"] = $params["province"];
+        }
+        if (isset($params["city"])) {
+            $where_["city"] = $params["city"];
+        }
+        if (isset($params["disc"])) {
+            $where_["disc"] = $params["disc"];
+        }
+
+
+
         $where_["create_time"] = date("Y-m-d H:i:s", time());
         $where_["update_time"] = date("Y-m-d H:i:s", time());
         Db::startTrans();