Commit 9a53dd23 authored by zhuwei's avatar zhuwei

商铺列表-加商圈

parent cee9293f
...@@ -117,7 +117,6 @@ class Shop extends Basic ...@@ -117,7 +117,6 @@ class Shop extends Basic
$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'];
//c端查对外的名字 b端查对内的名字 //c端查对外的名字 b端查对内的名字
if (isset($params['title']) && $params['site_area'] == 1 || $params['site_area'] == 2) { if (isset($params['title']) && $params['site_area'] == 1 || $params['site_area'] == 2) {
$conditions['external_title'] = array("like", "%" . trim($params['title']) . "%"); $conditions['external_title'] = array("like", "%" . trim($params['title']) . "%");
...@@ -262,12 +261,17 @@ class Shop extends Basic ...@@ -262,12 +261,17 @@ class Shop extends Basic
$conditions['status'] = !empty($params['status']) ? $params['status'] : array('in', "1,2"); //只显示上架或下架的 $conditions['status'] = !empty($params['status']) ? $params['status'] : array('in', "1,2"); //只显示上架或下架的
} }
$result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr); $result = $this->gHousesModel->getHousesList($pageNo, $pageSize, $order_, $field, $conditions, $spTagArr);
$m_business_district = new GBusinessDistrict();
//获取图片信息 //获取图片信息
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/'; $result[$key]["api_path"] = CK_IMG_URL . 'images/';
$result[$key]["rent_price"] = $val["rent_price"] * 0.01; $result[$key]["rent_price"] = $val["rent_price"] * 0.01;
$result[$key]["title"] = $val["disc"] . $result[$key]["title"];
$business_district = '';//查商圈
if($val["business_district_id"]){
$business_district = $m_business_district->getValue(['id'=>$val["business_district_id"]], 'name');
}
$result[$key]["title"] = $val["disc"] . $business_district .$result[$key]["title"];
$param["house_id"] = $val["id"]; $param["house_id"] = $val["id"];
$param["img_type"] = 1; //默认主图 $param["img_type"] = 1; //默认主图
......
...@@ -948,7 +948,7 @@ class GHouses extends BaseModel ...@@ -948,7 +948,7 @@ class GHouses extends BaseModel
*/ */
function getHousesList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $spTagsArr) function getHousesList($pageNo = 1, $pageSize = 15, $order_ = 'id desc', $field, $params, $spTagsArr)
{ {
return Db::table($this->table) $result = Db::table($this->table)
->field($field) ->field($field)
->where($params) ->where($params)
->where(function ($query) use ($spTagsArr) { ->where(function ($query) use ($spTagsArr) {
...@@ -958,6 +958,9 @@ class GHouses extends BaseModel ...@@ -958,6 +958,9 @@ class GHouses extends BaseModel
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
//echo Db::table($this->table)->getLastSql();
return $result;
} }
/** /**
......
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