Commit b3064e66 authored by zhuwei's avatar zhuwei

1

parent 08e3706f
...@@ -90,8 +90,6 @@ class AttentionShop extends Basic ...@@ -90,8 +90,6 @@ class AttentionShop extends Basic
return $this->response("101", "用户id不能为空"); return $this->response("101", "用户id不能为空");
} }
$params["is_del"] = 0; //关注中的商铺 $params["is_del"] = 0; //关注中的商铺
$params["type"] = 0;
$result = $this->attentionModel->myAttentionList($pageNo, $pageSize, $order_, $field, $params); $result = $this->attentionModel->myAttentionList($pageNo, $pageSize, $order_, $field, $params);
if (count($result) <= 0) { if (count($result) <= 0) {
return $this->response("200", "请求数据为空"); return $this->response("200", "请求数据为空");
...@@ -99,18 +97,18 @@ class AttentionShop extends Basic ...@@ -99,18 +97,18 @@ class AttentionShop extends Basic
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["price"] = $val["price"] * 0.01; $result[$key]["price"] = $val["price"] * 0.01;
$result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL; $result[$key]["api_path"] = SHOP_IMAGE_DEPOT_URL;
/* $imgParam["house_id"] = $val["house_id"]; /*
$imgParam["house_id"] = $val["house_id"];
$imgParam["img_type"] = 1; //默认主图 $imgParam["img_type"] = 1; //默认主图
$imgArr = $this->imgModel->getHouseImages($imgParam, 1); $imgArr = $this->imgModel->getHouseImages($imgParam, 1);
$result[$key]["images"] = $imgArr;*/ $result[$key]["images"] = $imgArr;
*/
if (empty($val['is_show_image'])) { if (empty($val['is_show_image'])) {
if ($val["external_image_id"]) { if ($val["external_image_id"]) {
$param["id"] = array("in", $val["external_image_id"]); $param["id"] = array("in", $val["external_image_id"]);
$param["img_status"] = 0; $param["img_status"] = 0;
$field = 'id,0 as house_id,img_type,label,img_name,img_status'; $field = 'id,0 as house_id,img_type,label,img_name,img_status';
$res = $this->imageDepotModel->getImageDepotById($field, $param, 1); $res = $this->imageDepotModel->getImageDepotById($field, $param, 1);
$result[$key]["images"] = count($res) > 0 ? $res : []; $result[$key]["images"] = count($res) > 0 ? $res : [];
} }
......
...@@ -99,6 +99,7 @@ class AttentionModel extends Model ...@@ -99,6 +99,7 @@ class AttentionModel extends Model
{ {
$params["a.user_id"] = $param["user_id"]; $params["a.user_id"] = $param["user_id"];
$params["a.is_del"] = $param["is_del"]; $params["a.is_del"] = $param["is_del"];
$params["type"] = 0;
//$params["b.room_num_left"] = array( "<>", 0 ); //剩余数为0 的商品不显示 //$params["b.room_num_left"] = array( "<>", 0 ); //剩余数为0 的商品不显示
$params["b.is_show"] = array( "eq", 0 ); //只显示公开的楼盘 $params["b.is_show"] = array( "eq", 0 ); //只显示公开的楼盘
return $this->field($field) return $this->field($field)
......
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