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

app/controller/house/v2/tool.js

@@ -63,10 +63,10 @@ class ToolController extends Controller {
     async gjjLoanMeasureInfo() {
 
         const { ctx } = this;
-        const app_user_id = ctx.app_user_id;
-        // const app_user_id = 'de76d708-f23d-4884-b8e6-298409535133';
+        const app_user_id = ctx.appUserId;
+        // const app_user_id = '23b6c1a6-87b8-4a3d-bf87-6a48d4cd5fdb';
         const token = ctx.cookies.get('token', { signed: false });
-        // const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImFwcF91c2VyX2lkIjoiZGU3NmQ3MDgtZjIzZC00ODg0LWI4ZTYtMjk4NDA5NTM1MTMzIiwicGFzc3BvcnQiOiIxNTk2ODc2Mjg5OCIsImFwcF9pZCI6IjM2M2IxNjI1LWYzYmMtNDY0Zi1iZTZmLTI0YzM2MWZiZGUxOCIsInVpZCI6IjgwZWY3OGFjLWI3ZDQtNDUzNy1iMTYyLTQ5NTk5Y2RlY2MzZSIsImxvZ2luX3R5cGUiOiIxIiwiYWNjb3VudF9pZCI6ImM2OGUyNDU0LTRmZWMtNDQzYy04YzYwLTVmOTNmNTdjZTNjNyIsImNoYW5uZWxfaWQiOiJhZTgyYjkwMC1mZTBlLTExZTgtYThlZS1mYjJlNDY2MzYyZDEiLCJkZXZpY2VfaWQiOiJkOGExZjc4OC0wNzc4LTQ5MTItODUzMi0wY2VmZGU1YmZhZjkiLCJvaWQiOiIxNzQwOTkzNTAiLCJkZXZpY2VfbG9naW5fbG9nc19pZCI6IjQyZTI4NjdlLTIyMzMtNGZiZS05YmRiLTBkYTJiMGE1Mjg5NCIsImFwcF90eXBlX2lkIjoiM2RkMzY1OGYtNGNhZS00NTQwLTllODItYzUyNGNlOTQxZTBiIn0sImV4cCI6MTU2Mjc0NDUxOSwiaWF0IjoxNTYwMjU1NDM5fQ.qSOc5yQPRiQs41n1SJ0QJS5O1feOD1GDOze_2s3xtYA';
+        // const token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImFwcF91c2VyX2lkIjoiMjNiNmMxYTYtODdiOC00YTNkLWJmODctNmE0OGQ0Y2Q1ZmRiIiwicGFzc3BvcnQiOiIxNTY1NTIwNzc5OCIsImFwcF9pZCI6IjM1M2MyZjRhLTVlZjgtNDQxOC05MDgyLTM1MzRiOWM4MDJkYyIsInVpZCI6ImVhYWY5ZDZkLTVkOTgtNDZhYi04YmJlLTYzOTAwNDZhZmJlZiIsImxvZ2luX3R5cGUiOiIxIiwiYWNjb3VudF9pZCI6IjFhNTYyZTQ3LTg1NDQtNDllNC04ZDI1LTkzNTgxMWI1YjQzOCIsImNoYW5uZWxfaWQiOiI5N2Y2MTA2MC00YWMxLTExZTktYTJhMC1hZGQxYWU3MzQyOWIiLCJkZXZpY2VfaWQiOiI2NzVmNmFhMS1iNGE0LTRmNjMtYjc1Ni1jY2JiZmIzZjk0ODciLCJvaWQiOiI4MTU2NDMiLCJkZXZpY2VfbG9naW5fbG9nc19pZCI6IjUyNDc4ZTliLTM4MmUtNDcyYy05NjA4LTY2M2VjMTk3MzQ1ZSIsImFwcF90eXBlX2lkIjoiMjE1MGQwZjEtZWUwNy00ZDE3LWEwMTktMjUxYmUzNjk5YmQxIn0sImV4cCI6MTU2MTYwNjc4NSwiaWF0IjoxNTU5MDQwNDI1fQ.tIz28GI9uCt8XWD32LCxyCq2SxzhWbaLxYKcu5aKC1E';
 
         const area = ctx.params.area;
         let months;

app/service/house/v2/collection.js

@@ -136,7 +136,7 @@ class CollectionService extends Service {
                     name: retList[j].name,
                     address: retList[j].address,
                     tags: retList[j].tags ? eval(retList[j].tags) : [],
-                    image: 'https://r.51gjj.com/' + retList[j].image,
+                    image: retList[j].image,
                     area: type === 1 ? Number(retList[j].house_area) : '',
                     price: type === 1 ? (['', 0].includes(Number(retList[j].reference_avg_price)) ? '--' : Number(retList[j].reference_avg_price)) : Number(retList[j].price),
                     type: type === 1 ? 'new_house' : 'rental_house',

app/service/house/v2/new_house.js

@@ -74,7 +74,7 @@ class NewHouseService extends Service {
             for (let i in newHouseImages) {
                 let image = {
                     id: newHouseImages[i].id,
-                    path: 'https://r.51gjj.com/' + newHouseImages[i].path,
+                    path: newHouseImages[i].path,
                     description: newHouseImages[i].description,
                 }
                 images.push(image);
@@ -302,7 +302,7 @@ class NewHouseService extends Service {
                 new_house_id: data.new_house_id,
                 type: data.type,//类型，如三居、四居
                 house_type: houseType[data.house_type] || '',
-                image: 'https://r.51gjj.com/' + data.image,
+                image: data.image,
                 apartment: data.apartment,//户型，如4室2厅3卫
                 sale_type: saleType[data.sale_type] || '',
                 area: Number(data.area),//面积
@@ -351,7 +351,7 @@ class NewHouseService extends Service {
                 //只展示最近三个月内开盘的楼盘，往前追溯三个月,列表单次加载30条楼盘数据，滑到底部再次加载30条
                 let endDate = moment().subtract(90, 'days').format('YYYY-MM-DD HH:mm:ss');
                 filter.where.open_date = { $gt: endDate };
-                filter.order.push(['sal_type', 'desc']);
+                filter.order.push(['sale_type', 'desc']);
             } else if (type === 'favourable') {
                 //点击优惠好盘只展示有优惠的楼盘,列表单次加载30条楼盘数据，滑到底部再次加载30条
                 filter.where.favourable_info = { $not: null };
@@ -403,7 +403,7 @@ class NewHouseService extends Service {
                     name: newHouseList.rows[i].name,
                     address: newHouseList.rows[i].address,
                     tags: newHouseList.rows[i].tags ? eval(newHouseList.rows[i].tags) : [],
-                    image: 'https://r.51gjj.com/' + newHouseList.rows[i].image,
+                    image: newHouseList.rows[i].image,
                     price: Number(newHouseList.rows[i].reference_avg_price) === 0 ? '--' : Number(newHouseList.rows[i].reference_avg_price),
                     corner: newHouseList.rows[i].cornerMarker,
                 };

app/service/house/v2/order.js

@@ -91,7 +91,7 @@ class OrderService extends Service {
                     name: retList[j].name,
                     address: retList[j].address,
                     tags: retList[j].tags ? eval(retList[j].tags) : [],
-                    image: 'https://r.51gjj.com/' + retList[j].image,
+                    image: retList[j].image,
                     area: type === 1 ? Number(retList[j].house_area) : '',
                     price: type === 1 ? (Number(retList[j].reference_avg_price) === 0 ? '--' : Number(retList[j].reference_avg_price)) : Number(retList[j].price),
                     time: moment().format('YYYY-MM-DD') === moment(orderList[j].order_at).format('YYYY-MM-DD') ? '今天' : moment(orderList[j].order_at).format('YYYY-MM-DD'),

app/service/house/v2/rental_house.js

@@ -53,7 +53,7 @@ class RentalHouseService extends Service {
             where.id = { $in: rental_houses_ids };
         }
 
-        const rental_houses_results = await ctx.realestateModel.RentalHouse.list({ page: page, limit: limit, where: where, order: [['order_id', 'asc']] });
+        const rental_houses_results = await ctx.realestateModel.RentalHouse.list({ page: page, limit: Number(limit), where: where, order: [['order_id', 'asc']] });
         let rental_houses = await this.formatRentalHouseBasic(rental_houses_results.rows);
         rental_houses = R.project(['id', 'image', 'name', 'address', 'price', 'tags', 'favourable_info'])(rental_houses);
 
@@ -89,8 +89,10 @@ class RentalHouseService extends Service {
 
         //TODO添加用户足迹，是否关注过房源
         await ctx.service.house.v2.footPrint.addFootPrint({ type: 2, id: rental_house_id });
+        //是否关注
+        let collectionTask = await ctx.service.house.collection.getCollection({ type: 2, id: rental_house_id });
 
-        return { house_basic, house_images, house_types, collection: false, };
+        return { house_basic, house_images, house_types, collection: collectionTask, };
     }
 
     //格式化户型数据