Commit 65128d48 authored by zw's avatar zw

return

parent c74ad866
...@@ -99,7 +99,7 @@ class Shop extends Basic ...@@ -99,7 +99,7 @@ class Shop extends Basic
} else { } else {
// $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type // $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
$field = "id,external_title as title,internal_address as address,city,disc,business_district_id,status,industry_type $field = "id,internal_title as title,internal_address as address,city,disc,business_district_id,status,industry_type
,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_lock ,shop_area_start,shop_area_end,shop_type,residue_num,shop_sign,is_carefully_chosen,rent_type,rent_price,is_lock
,is_exclusive_type"; ,is_exclusive_type";
...@@ -114,7 +114,7 @@ class Shop extends Basic ...@@ -114,7 +114,7 @@ class Shop extends Basic
if (isset($params['title']) && $params['site_area'] == 1 || $params['site_area'] == 2) { if (isset($params['title']) && $params['site_area'] == 1 || $params['site_area'] == 2) {
$conditions['external_title'] = array("like", "%" . trim($params['title']) . "%"); $conditions['external_title'] = array("like", "%" . trim($params['title']) . "%");
} else if (isset($params['title'])) { } else if (isset($params['title'])) {
$conditions['internal_title|id'] = array("like", "%" . trim($params['title']) . "%"); $conditions['internal_title'] = array("like", "%" . trim($params['title']) . "%");
} }
//c端查对外的名字 b端查对内的名字 //c端查对外的名字 b端查对内的名字
...@@ -253,7 +253,6 @@ class Shop extends Basic ...@@ -253,7 +253,6 @@ class Shop extends Basic
foreach ($result as $key => $val) { foreach ($result as $key => $val) {
$result[$key]["api_path"] = CK_IMG_URL . 'images/'; $result[$key]["api_path"] = CK_IMG_URL . 'images/';
$result[$key]["rent_price"] = $val["rent_price"] * 0.01; $result[$key]["rent_price"] = $val["rent_price"] * 0.01;
$result[$key]["title"] = $val["id"] . $val["disc"] . $result[$key]["title"];
$param["house_id"] = $val["id"]; $param["house_id"] = $val["id"];
$param["img_type"] = 1; //默认主图 $param["img_type"] = 1; //默认主图
...@@ -394,7 +393,7 @@ class Shop extends Basic ...@@ -394,7 +393,7 @@ class Shop extends Basic
if ($params['site_area'] == 3) { if ($params['site_area'] == 3) {
// $field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status, // $field = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
$field = "a.id,a.external_title as title,a.external_address as address,a.city,a.disc,a.business_district_id,a.status, $field = "a.id,a.internal_title as title,a.external_address as address,a.city,a.disc,a.business_district_id,a.status,
a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type, a.industry_type,a.shop_area_start,a.shop_area_end,a.shop_type,a.residue_num,a.shop_sign,a.is_carefully_chosen,a.rent_type,
a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude, a.rent_price,a.management_fee,a.slotting_fee,a.total,a.market_area,a.is_has_gas,a.file_path,a.longitude,a.latitude,
b.enter_num,b.internal_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic, b.enter_num,b.internal_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
......
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