Merge branch 'test'

application/index/controller/LookShop.php

@@ -43,7 +43,7 @@ class LookShop extends Basic
 
         $condition = [];
         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"])) {
             $condition["a.house_id"] = $params["house_id"];
@@ -67,7 +67,7 @@ class LookShop extends Basic
         //$total  = $this->tLookShopModel->getListCount($condition, $field);
 
         $list["list"]  = $result;
-        $list["total"] = 0;
+        $list["total"] = 150;
         return $this->response("200", "success", $list);
 
     }