addd

app/controller/house/new_house.js

@@ -3,22 +3,6 @@
 const Controller = require('egg').Controller;
 
 class NewHouseController extends Controller {
-
-    /**
-     * 新房列表
-     * 全部all 在售sale 最近开盘open 优惠favourtable 首页home
-     */
-    async getNewHouseListByType() {
-        const { ctx } = this;
-        let inputParams = ctx.params;
-        const rule = {
-            type: { type: 'string', required: true },
-        };
-        ctx.validate(rule, inputParams);
-        const ret = await ctx.service.house.newHouse.getNewHouseListByType(inputParams.type);
-        ctx.success(ret);
-    }
-
     /**
      * 根据筛选条件获得新房列表
      */
@@ -26,16 +10,25 @@ class NewHouseController extends Controller {
         const { ctx } = this;
         let inputParams = ctx.request.body;
         const rule = {
+            page: { type: 'string', required: false },//页面
+            page_size: { type: 'string', required: false },//条数
+
             area_code: { type: 'string', required: false },//区域
             unit_price: { type: 'object', required: false },//价格
             total_price: { type: 'object', required: false },//总价
             area: { type: 'object', required: false },//面积
             house_type: { type: 'string', required: false },//房型
-            page: { type: 'string', required: false },//页面
-            page_size: { type: 'string', required: false },//条数
+
+            //通过type选择指定内容 全部all 在售sale 最近开盘open 优惠favourtable 首页home,和上面的筛选项互斥
+            type: { type: 'string', required: false },//
         };
         ctx.validate(rule, inputParams);
-        const ret = await ctx.service.house.newHouse.getNewHouseList(inputParams);
+        let ret = {};
+        if (inputParams.hasOwnProperty('type') && inputParams.type !== '') {
+            ret = await ctx.service.house.newHouse.getNewHouseListByType(inputParams);
+        } else {
+            ret = await ctx.service.house.newHouse.getNewHouseList(inputParams);
+        }
         ctx.success(ret);
     }
 

app/router/house.js

@@ -17,7 +17,6 @@ module.exports = app => {
 
 
     //新房
-    router.get('/new_house/list/:type', 'house.newHouse.getNewHouseListByType');//某个指定列表
     router.post('/new_house/list', 'house.newHouse.getNewHouseList');//根据条件筛选列表
     router.get('/new_house/:id', 'house.newHouse.getNewHouse');//新房具体信息
     router.get('/new_house_type/:id', 'house.newHouse.getNewHouseType');//新房户型

app/service/house/new_house.js

@@ -357,14 +357,14 @@ class NewHouseService extends Service {
      * @param {*} type 四种默认的按钮筛选 全部all 在售sale 最近开盘open 优惠favourable 首页home
      */
     async getNewHouseListByType(condition) {
-        const { ctx } = this;
+        const { ctx, service } = this;
         let types = ['all', 'sale', 'open', 'favourable', 'home'];
         if (!condition.hasOwnProperty('type') || !types.includes(condition.type)) {
             ctx.failed('error or empty list type');
         }
         let type = condition.type;
         let page = Number(condition.page) || 1;
-        let pageSize = Number(condition.pageSize) || 30;
+        let pageSize = Number(condition.page_size) || 30;
         let filter = {
             pageIndex: page,
             pageSize: pageSize,
@@ -443,48 +443,6 @@ class NewHouseService extends Service {
         return ret;
     }
 
-    async getNewHouseByFilter(condition) {
-        const { ctx, service } = this;
-        let page = Number(condition.page) || 1;
-        let pageSize = Number(condition.pageSize) || 30;
-        let filter = {
-            pageIndex: page,
-            pageSize: pageSize,
-            queryConditions: [{
-                key: "state",
-                value: 1,
-                operator: "equal"
-            },],
-            orderConditions: [],
-        }
-        if (condition.hasOwnProperty('queryConditions')) {
-            filter.queryConditions = filter.queryConditions.concat(condition.queryConditions);
-        }
-        if (condition.hasOwnProperty('orderConditions')) {
-            filter.orderConditions = filter.orderConditions.concat(condition.orderConditions);
-        }
-        let newHouseList = await service.houseCommon.newHouse.all(filter);
-        let list = [];
-        if (newHouseList.rowCount > 0) {
-            for (let i in newHouseList.results) {
-                let tmp = {
-                    id: newHouseList.results[i].id,
-                    name: newHouseList.results[i].name,
-                    address: newHouseList.results[i].address,
-                    tags: newHouseList.results[i].tags.split(','),
-                    image: newHouseList.results[i].image,
-                    price: newHouseList.results[i].referenceAvgPrice,
-                };
-                list.push(tmp);
-            }
-        }
-        let ret = {
-            results: list,
-            count: list.length
-        };
-        return ret;
-    }
-
 }
 
 module.exports = NewHouseService;