Merge remote-tracking branch 'origin/wx0604' into wx0604

application/api_broker/controller/Shop.php

@@ -106,8 +106,8 @@ class Shop extends Basic
         }
 
         if (isset($params['start_time']) && isset($params['end_time'])) {
-            $start_time = date('Y-m-d H:i:s',$params['start_time']);
-            $end_time   = date('Y-m-d H:i:s',$params['end_time']);
+            $start_time                = date('Y-m-d H:i:s', $params['start_time']);
+            $end_time                  = date('Y-m-d H:i:s', $params['end_time']);
             $conditions['create_time'] = array( 'between', array( $start_time, $end_time ) );
         }
 
@@ -179,9 +179,9 @@ class Shop extends Basic
         }
         if (!empty($conditions)) {
             $conditions['status'] = array( 'eq', 1 ); //只显示上架
-            if ($params['site_area'] == 1 || $params['site_area'] == 2){
+            if ($params['site_area'] == 1 || $params['site_area'] == 2) {
                 $conditions['is_show'] = array( 'eq', 0 ); //c端只显示可显示的楼盘
-            }elseif ($params["site_area"] == 4){
+            } elseif ($params["site_area"] == 4) {
                 $conditions['status'] = array( 'in', "1,2" ); //b端搜索显示上架下架的
             }
         }
@@ -247,7 +247,7 @@ class Shop extends Basic
             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.external_item_advantage as item_advantage,b.sign_rule,b.do_business_date, b.opening_date,b.traffic,
             b.auditorium,b.tiny_brochure_url,b.start_business_date,b.fee_rule";
-
+            $conditions['a.status']  = array( "eq", 1 );
             $conditions['a.is_show'] = array( 'eq', 0 ); //c端只显示公开楼盘
         } else {
             $field                  = "a.id,a.internal_title as title,a.internal_address as address,a.city,a.disc,a.business_district_id,a.status,
@@ -255,10 +255,10 @@ class Shop extends Basic
             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.auditorium,b.tiny_brochure_url,b.start_business_date,a.upload_id,b.fee_rule,b.landlord_remark,a.create_time,b.landlord_phone";
+            $conditions['a.status'] = array( "neq", 3 );
         }
 
         $conditions['a.id'] = array( "eq", $params["id"] );
-        $conditions['a.status'] = array( "neq", 3 );
 
 
         $result = $this->gHousesModel->getHouseDetailById($field, $conditions);
@@ -287,7 +287,7 @@ class Shop extends Basic
         $param["img_type"]        = 3;//图片类型:1效果图，2实景图，3样板图，4户型图，5交通图
         $result["plan_images"]    = $this->gHousesImgModel->getHouseImages($param, 1);
         $result["plan_images"]    = [];
-        $result['landlord_phone'] = json_decode ($result['landlord_phone'], true);
+        $result['landlord_phone'] = json_decode($result['landlord_phone'], true);
 
         $result['create_time'] = date('Y-m-d', strtotime($result['create_time']));
         if ($result['status'] == 0) {