merge house_v3

app/controller/house/v2/rental_house.js

@@ -33,8 +33,8 @@ class RentalHouseController extends Controller {
     const input_params = ctx.request.body;
 
     const rule = {
-      brand: { type: 'string', required: false },//品牌
-      // brand: { type: 'array', required: false },//品牌
+      // brand: { type: 'string', required: false },//品牌
+      brand: { type: 'array', required: false },//品牌
       area_code: { type: 'object', required: false },//区域
       price: { type: 'object', required: false },//价格
       house_type: { type: 'string', required: false },//房型

app/service/house/v2/option.js

@@ -81,7 +81,7 @@ class OptionService extends Service {
 
         return {
             result: [
-                { name: '品牌', id: -1, path: [], nameShow: '', _children: brands },
+                // { name: '品牌', id: -1, path: [], nameShow: '', _children: brands },
                 { name: '区域', id: -2, path: [], nameShow: '', _children: areas },
                 { name: '价格', id: -3, path: [], nameShow: '', _children: prices },
                 { name: '户型', id: -4, path: [], nameShow: '', _children: house_types }
@@ -109,7 +109,7 @@ class OptionService extends Service {
                 },
                 { name: '面积', id: -5, path: [], nameShow: '', _children: house_area },
                 // { name: '户型', id: -6, path: [], nameShow: '', _children: house_types },
-                { name: '贷款方式', id: -6, path: [], nameShow: '', _children: loan_type },
+                // { name: '贷款方式', id: -6, path: [], nameShow: '', _children: loan_type },
             ]
         };
     }

app/service/house/v2/rental_house.js

@@ -28,8 +28,8 @@ class RentalHouseService extends Service {
 
         let where = { status: 'online', valid: 1 };
         if (brand) {
-            where.developer_id = brand;
-            // where.developer_id = { $in: brand };
+            // where.developer_id = brand;
+            where.developer_id = { $in: brand };
         }
         if (name) {
             //增加搜索历史