Skip to content

T
tl_estate
Commit 5de8c014 authored by zw's avatar zw
Browse files
Options

Merge branch 'test'

# Conflicts: # application/index/controller/LookShop.php
parents 35c24d56 3c56fcfd
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
application/index/controller/LookShop.php
View file @ 5de8c014
...@@ -43,7 +43,7 @@ class LookShop extends Basic ...@@ -43,7 +43,7 @@ class LookShop extends Basic
$condition = []; $condition = [];
if (!empty($params["start_time"]) && !empty($params["end_time"])) { if (!empty($params["start_time"]) && !empty($params["end_time"])) {
$condition["a.look_time"] = array( "between", array( $params["start_time"], $params["end_time"] . " 23:59:59" ) ); $condition["a.look_time"] = array( "between", array( $params["start_time"], $params["end_time"] ) );
} }
if (!empty($params["house_id"])) { if (!empty($params["house_id"])) {
$condition["a.house_id"] = $params["house_id"]; $condition["a.house_id"] = $params["house_id"];
...@@ -67,7 +67,7 @@ class LookShop extends Basic ...@@ -67,7 +67,7 @@ class LookShop extends Basic
//$total = $this->tLookShopModel->getListCount($condition, $field); //$total = $this->tLookShopModel->getListCount($condition, $field);
$list["list"] = $result; $list["list"] = $result;
$list["total"] = 0; $list["total"] = 150;
return $this->response("200", "success", $list); return $this->response("200", "success", $list);
} }
......
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