Commit b04b1190 authored by clone's avatar clone

bug

parent 10d194ea
...@@ -283,6 +283,7 @@ class Broker extends Basic ...@@ -283,6 +283,7 @@ class Broker extends Basic
$data['user_info'] = $user_res; $data['user_info'] = $user_res;
$data['user_date'] = $orderLog->selectListByUserId($user_id,''); $data['user_date'] = $orderLog->selectListByUserId($user_id,'');
$data['user_history'] = $records_result; $data['user_history'] = $records_result;
$data['agent_path'] = AGENTHEADERIMGURL;
return $this->response("200", "success!", $data); return $this->response("200", "success!", $data);
} }
...@@ -301,6 +302,7 @@ class Broker extends Basic ...@@ -301,6 +302,7 @@ class Broker extends Basic
} }
$orderLog = new OrderLogService(); $orderLog = new OrderLogService();
$data = $orderLog->selectListByUserId($params["user_id"],$params["keyword"]); $data = $orderLog->selectListByUserId($params["user_id"],$params["keyword"]);
$data['agent_path'] = AGENTHEADERIMGURL;
return $this->response("200","request success",$data); return $this->response("200","request success",$data);
} }
......
...@@ -226,14 +226,14 @@ class Shop extends Basic ...@@ -226,14 +226,14 @@ class Shop extends Basic
$conditions['a.id'] = array( "eq", $params["id"] ); $conditions['a.id'] = array( "eq", $params["id"] );
$result = $this->gHousesModel->getHouseDetailById($field, $conditions); $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
$result["rent_price"] = $result["rent_price"] * 0.01; $result["rent_price"] = $result["rent_price"] * 0.01;
$result["management_fee"] = $result["management_fee"] * 0.01; $result["management_fee"] = $result["management_fee"] * 0.01;
$result["slotting_fee"] = $result["slotting_fee"] * 0.01; $result["slotting_fee"] = $result["slotting_fee"] * 0.01;
$result["start_business_date"] = date("Y-m-d", strtotime($result["start_business_date"])); $result["start_business_date"] = empty($result["start_business_date"]) ? "" : date("Y-m-d", strtotime($result["start_business_date"]));
$result["opening_date"] = date("Y-m-d", strtotime($result["opening_date"])); $result["opening_date"] = empty($result["start_business_date"]) ? "" : date("Y-m-d", strtotime($result["opening_date"]));
$result["api_path"] = CK_IMG_URL . 'images/'; $result["api_path"] = CK_IMG_URL . 'images/';
$param["house_id"] = $params['id']; $param["house_id"] = $params['id'];
//todo 这里的是否要更改成b端后台上传的类型 //todo 这里的是否要更改成b端后台上传的类型
$param["img_type"] = 2; $param["img_type"] = 2;
$result["images"] = $this->gHousesImgModel->getHouseImages($param, 15); $result["images"] = $this->gHousesImgModel->getHouseImages($param, 15);
......
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