Merge branch '0529-v3.3.0' of https://gitee.com/zwyjjc/tl_estate into 0529-v3.3.0

application/index/service/OfficeRoomService.php

@@ -1218,11 +1218,11 @@ class OfficeRoomService
         }
 
         if (isset($params['is_carefully_chosen'])) {
-            $where['a.is_carefully_chosen'] = $params['shop_sign'];  //精选商铺--0否1是
+            $where['a.is_carefully_chosen'] = $params['is_carefully_chosen'];  //精选商铺--0否1是
             $order = 'a.home_page_sort desc';
         }
 
-        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name';
+        $field = 'a.id,b.disc,b.title,b.address,c.name as business_name,a.building_id';
         try {
             $data = $this->m_office_room->getRoomBuilding($page_no, $page_size, $order, $field, $where);
         } catch (\Exception $e) {
@@ -1234,12 +1234,12 @@ class OfficeRoomService
         $result_data = [];
         foreach ($data as $k=>$v) {
             $tmp['id'] = $v['id'];
-            $tmp['price'] =  $this->MinField($v['id'], 'price');
+            $tmp['price'] =  $this->MinField($v['building_id'], 'price');
             $tmp['price'] = empty($tmp['price']) ? 0:$tmp['price'];
-            $tmp['price_total'] =  $this->MinField($v['id'], 'price_total');
+            $tmp['price_total'] =  $this->MinField($v['building_id'], 'price_total');
             $tmp['price_total'] = empty($tmp['price_total']) ? 0:$tmp['price_total'];
-            $tmp['shop_sign'] = $this->getBuildingSign($v['id']);
-            $area = $this->MinField($v['id'], 'area');
+            $tmp['shop_sign'] = $this->getBuildingSign($v['building_id']);
+            $area = $this->MinField($v['building_id'], 'area');
             $tmp['title'] = $v['disc'].' '.$v['business_name']. ' '.$v['title']. ' '.$area.'㎡';
             $result_data[] = $tmp;
         }