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

app/controller/house/rental_house.js

@@ -22,7 +22,7 @@ class RentalHouseController extends Controller {
       uid: user_id,
     }
     // house_h5_rental_home_banners
-    const banners_result = await ctx.helper.send_request(this.config.NODE_URL + '/51app/api/block/all', { alias: '51fangc_rental_home_banners' }, { method: 'GET', dataType: 'json', headers: headers });
+    const banners_result = await ctx.helper.send_request(this.config.NODE_BASE_URL + '/51app/api/block/all', { alias: '51fangc_rental_home_banners' }, { method: 'GET', dataType: 'json', headers: headers });
     let banners = [];
     if (banners_result.status === 200) {
       banners = banners_result.data.results;

app/service/house/rental_house.js

@@ -82,8 +82,9 @@ class RentalHouseService extends Service {
             value: 1,
             operator: "equal"
         });
+        const pageSize = condition.page_size || 30;
         const filter = {
-            pageSize: 30,
+            pageSize: pageSize,
             queryConditions: queryConditions,
             orderConditions: [{
                 key: 'price',

config/config.prod.js

@@ -55,6 +55,7 @@ module.exports = appInfo => {
 
   config.CDN_BASE_URL = 'https://r.51gjj.com/image/';
   config.NODE_URL = process.env.NODE_URL;
+  config.NODE_BASE_URL = process.env.NODE_BASE_URL;
   config.PHP_URL = process.env.PHP_URL;
 
   config.HOUSE_SERVICE_API = process.env.HOUSE_SERVICE_API; // 房产