Commit f1bf2189 authored by clone's avatar clone

bug

parent 9ff09b67
...@@ -7,6 +7,7 @@ use app\model\Applies; ...@@ -7,6 +7,7 @@ use app\model\Applies;
use app\model\AppointWatchShop; use app\model\AppointWatchShop;
use app\model\Evaluate; use app\model\Evaluate;
use app\model\GHouses; use app\model\GHouses;
use app\model\GHousesImgs;
use app\model\HouseInfos; use app\model\HouseInfos;
use think\helper\Time; use think\helper\Time;
use app\model\HouseImgs; use app\model\HouseImgs;
...@@ -34,7 +35,7 @@ class AppointmentTime extends Basic ...@@ -34,7 +35,7 @@ class AppointmentTime extends Basic
$this->appointmentTimeModel = new AppointWatchShop(); $this->appointmentTimeModel = new AppointWatchShop();
//$this->houseInfoModel = new HouseInfos(); //$this->houseInfoModel = new HouseInfos();
$this->houseInfoModel = new GHouses(); $this->houseInfoModel = new GHouses();
$this->dbImg = new HouseImgs(); $this->dbImg = new GHousesImgs();
$this->appliesModel = new Applies(); $this->appliesModel = new Applies();
$this->evaluateMode = new Evaluate(); $this->evaluateMode = new Evaluate();
} }
...@@ -156,10 +157,10 @@ class AppointmentTime extends Basic ...@@ -156,10 +157,10 @@ class AppointmentTime extends Basic
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["api_path"] = IMG_PATH; $result[$key]["api_path"] = IMG_PATH;
$param["house_id"] = $val["house_id"]; $param["house_id"] = $val["house_id"];
$param["imgtype"] = 1; //默认主图 $param["img_type"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1); $result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
$houseInfo = $this->houseInfoModel->getHouseDetails("a.room_num_left,b.foreign_name", array( "a.id" => $val["house_id"] )); $houseInfo = $this->houseInfoModel->getHouseDetail("residue_num as room_num_left,external_title as foreign_name", array( "id" => $val["house_id"] ));
$result[$key]["room_num_left"] = $houseInfo["room_num_left"]; $result[$key]["room_num_left"] = $houseInfo["room_num_left"];
$result[$key]["foreign_name"] = $houseInfo["foreign_name"]; $result[$key]["foreign_name"] = $houseInfo["foreign_name"];
......
...@@ -65,11 +65,11 @@ class AttentionShop extends Basic ...@@ -65,11 +65,11 @@ class AttentionShop extends Basic
public function attentionList() public function attentionList()
{ {
$params = $this->params; $params = $this->params;
/* $params = array( $params = array(
"user_id" => 122, "user_id" => 816,
"pageNo" => 1, "pageNo" => 1,
"pageSize" => 15, "pageSize" => 15,
);*/ );
$pageNo = empty($params['pageNo']) ? 1 : $params['pageNo']; $pageNo = empty($params['pageNo']) ? 1 : $params['pageNo'];
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize']; $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
......
...@@ -96,7 +96,6 @@ class AttentionModel extends Model ...@@ -96,7 +96,6 @@ class AttentionModel extends Model
return $this->field($field) return $this->field($field)
->alias("a") ->alias("a")
->join('g_houses b', 'a.house_id = b.id', 'LEFT') ->join('g_houses b', 'a.house_id = b.id', 'LEFT')
->join('g_houses_imgs c', 'c.house_id = b.id', 'LEFT')
->where($params) ->where($params)
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment