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

app/service/house/new_house.js

@@ -115,11 +115,23 @@ class NewHouseService extends Service {
             for (let i in developerinfo) {
                 developer.push(developerinfo[i].developer.name);
             }
+
+            let nearBy = '';
+            if (data.residential.nearBy.length > 0) {
+                let temp = eval(data.residential.nearBy);
+                for (let i in temp) {
+                    let subTemp = '';
+                    for (let j in temp[i]) {
+                        subTemp += j + ':' + temp[i][j].join(',');
+                    }
+                    nearBy += subTemp + ';';
+                }
+            }
             ret.basic = {
                 id: data.id,
                 name: data.name,//标题
                 description: data.description,//描述
-                tags: data.tags.split(','),//项目特色
+                tags: data.tags ? eval(data.tags) : [],//项目特色
                 favourable_info: data.favourableInfo,//优惠
                 reference_avg_price: data.referenceAvgPrice,//均价
                 reference_total_price: data.referenceTotalPrice,//总价
@@ -138,7 +150,7 @@ class NewHouseService extends Service {
             ret.detail = {
                 basic: {
                     reference_avg_price: data.referenceAvgPrice,//均价
-                    tags: data.tags.split(','),//项目特色
+                    tags: data.tags ? eval(data.tags) : [],//项目特色
                     property_type: houseType[data.houseType] || '',//物业类型
                     property_right_years: data.residential.propertyRightYears,//产权年限
                     build_type: archType[data.residential.archType] || '',//建筑类型 1 板楼 2塔楼'
@@ -164,7 +176,7 @@ class NewHouseService extends Service {
                     heat_supply_type: data.residential.heatSupplyType,//供暖方式
                     water_supply_type: data.residential.waterSupplyType,//供水方式
                     power_supply_type: data.residential.powerSupplyType,//供电方式
-                    near_by: data.residential.nearBy,//周边规划
+                    near_by: nearBy,//周边规划
                 },
                 permit: {
                     pre_sale_permit: data.preSalePermit,//预售证
@@ -641,7 +653,7 @@ class NewHouseService extends Service {
                     id: newHouseList.results[i].id,
                     name: newHouseList.results[i].name,
                     address: newHouseList.results[i].address,
-                    tags: newHouseList.results[i].tags.split(','),
+                    tags: eval(newHouseList.results[i].tags),
                     image: newHouseList.results[i].image,
                     price: newHouseList.results[i].referenceAvgPrice,
                 };