Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/service/house/v2/new_house.js

@@ -398,7 +398,7 @@ class NewHouseService extends Service {
         }
 
         //贷款方式
-        if (condition.loan_type) {
+        if (condition.loan_type && Number(condition.loan_type) !== 0) {
             filter.where.loan_type = Number(condition.loan_type);
         }
 

app/service/house/v2/option.js

@@ -63,6 +63,11 @@ const NEW_HOUSE_AREA = [
     { name: '200平米以上', id: -144, min: 200, max: 999 }
 ]
 
+const NEW_HOUSE_LOAN_TYPE = [
+    { name: '全部', id: -146, values: 0 },
+    { name: '可公积金贷款', id: -147, values: 1 },
+];
+
 class OptionService extends Service {
 
     //获取筛选项
@@ -91,9 +96,9 @@ class OptionService extends Service {
         const total_price = NEW_HOUSE_TOTAL_PRICE;
         const house_types = HOUSE_TYPE;
         const house_area = NEW_HOUSE_AREA;
+        const loan_type = NEW_HOUSE_LOAN_TYPE;
         const areas = await this.getAreaOptions(city_code);
 
-
         return {
             result: [
                 { name: '区域', id: -1, path: [], nameShow: '', _children: areas },
@@ -103,7 +108,8 @@ class OptionService extends Service {
                         { name: '单价', id: -4, _children: unit_price }]
                 },
                 { name: '面积', id: -5, path: [], nameShow: '', _children: house_area },
-                { name: '户型', id: -6, path: [], nameShow: '', _children: house_types },
+                // { name: '户型', id: -6, path: [], nameShow: '', _children: house_types },
+                { name: '贷款方式', id: -6, path: [], nameShow: '', _children: loan_type },
             ]
         };
     }