Commit 46c15976 authored by clone's avatar clone

bug

parent 2310d009
...@@ -5,6 +5,7 @@ namespace app\api\controller; ...@@ -5,6 +5,7 @@ namespace app\api\controller;
use app\api\extend\Basic; use app\api\extend\Basic;
use app\model\Applies; use app\model\Applies;
use app\model\AppointWatchShop; use app\model\AppointWatchShop;
use app\model\Evaluate;
use app\model\HouseInfos; use app\model\HouseInfos;
use think\helper\Time; use think\helper\Time;
use app\model\HouseImgs; use app\model\HouseImgs;
...@@ -24,6 +25,7 @@ class AppointmentTime extends Basic ...@@ -24,6 +25,7 @@ class AppointmentTime extends Basic
protected $houseInfoModel; protected $houseInfoModel;
protected $dbImg; protected $dbImg;
protected $appliesModel; protected $appliesModel;
protected $evaluateMode;
function __construct($request = null) function __construct($request = null)
{ {
...@@ -32,6 +34,7 @@ class AppointmentTime extends Basic ...@@ -32,6 +34,7 @@ class AppointmentTime extends Basic
$this->houseInfoModel = new HouseInfos(); $this->houseInfoModel = new HouseInfos();
$this->dbImg = new HouseImgs(); $this->dbImg = new HouseImgs();
$this->appliesModel = new Applies(); $this->appliesModel = new Applies();
$this->evaluateMode = new Evaluate();
} }
/** /**
...@@ -123,9 +126,6 @@ class AppointmentTime extends Basic ...@@ -123,9 +126,6 @@ class AppointmentTime extends Basic
$result = $this->getYetList($pageNo, $pageSize, $params); $result = $this->getYetList($pageNo, $pageSize, $params);
} }
if (count($result) > 0) { if (count($result) > 0) {
return $this->response("200", "request success", $result); return $this->response("200", "request success", $result);
} else { } else {
...@@ -174,7 +174,7 @@ class AppointmentTime extends Basic ...@@ -174,7 +174,7 @@ class AppointmentTime extends Basic
*/ */
public function getYetList($pageNo, $pageSize, $params) public function getYetList($pageNo, $pageSize, $params)
{ {
$field = "a.id,a.phpone as phone,a.agent_id as agents_id,a.receptiontime as expect_time,a.house_id,b.title as house_title,b.room_num_left,IFNULL(1,1) as is_evaluate"; $field = "a.id,a.phpone as phone,a.agent_id as agents_id,a.receptiontime as expect_time,a.house_id,b.title as house_title,b.room_num_left";
$where_["a.receptiontime"] = array( "neq", "null" ); $where_["a.receptiontime"] = array( "neq", "null" );
$where_["a.phpone"] = array( "eq", $params["phone"] ); $where_["a.phpone"] = array( "eq", $params["phone"] );
...@@ -185,9 +185,10 @@ class AppointmentTime extends Basic ...@@ -185,9 +185,10 @@ class AppointmentTime extends Basic
$param["house_id"] = $val["house_id"]; $param["house_id"] = $val["house_id"];
$param["imgtype"] = 1; //默认主图 $param["imgtype"] = 1; //默认主图
$result[$key]["images"] = $this->dbImg->getHouseImages($param, 1); $result[$key]["images"] = $this->dbImg->getHouseImages($param, 1);
}
//todo 是否评价 //todo 是否评价
$evaluateResult = $this->evaluateMode->getIsEvaluate(10, $val["id"], $params["user_id"]);
$result[$key]["is_evaluate"] = count($evaluateResult) > 0 ? 1 : 0;
}
return $result; return $result;
......
...@@ -95,6 +95,8 @@ $ckfinder_dir = dirname(__FILE__); ...@@ -95,6 +95,8 @@ $ckfinder_dir = dirname(__FILE__);
$project_dir = str_replace('\\','/',realpath($ckfinder_dir . '/../..')); $project_dir = str_replace('\\','/',realpath($ckfinder_dir . '/../..'));
$attachments_dir = $project_dir . '/lib/Attachments/'; $attachments_dir = $project_dir . '/lib/Attachments/';
$baseDir = $attachments_dir; $baseDir = $attachments_dir;
//$baseDir = resolveUrl($baseUrl); //$baseDir = resolveUrl($baseUrl);
......
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