Commit 42fd88b3 authored by 任国军's avatar 任国军

fix institutions order

parent 3b874974
...@@ -368,14 +368,14 @@ class InstitutionService extends Service { ...@@ -368,14 +368,14 @@ class InstitutionService extends Service {
if (lbs.travel_method === 'walking') { if (lbs.travel_method === 'walking') {
travel_tips = `${area_name},距我${distance}km,步行${duration}分钟`; travel_tips = `${area_name},距我${distance}km,步行${duration}分钟`;
} }
if (distance === 0 && duration === 0) { if (Number(distance) === 0 && Number(duration) === 0) {
travel_tips = '暂无法计算出距离'; travel_tips = '暂无法计算出距离';
} }
// area.distance = distance; // area.distance = distance;
// area.duration = duration; // area.duration = duration;
// area.travel_tips = travel_tips; // area.travel_tips = travel_tips;
institution_area.distance = distance; institution_area.distance = Number(distance) === 0 ? 999999999 : distance;
institution_area.duration = duration; institution_area.duration = duration;
institution_area.travel_tips = travel_tips; institution_area.travel_tips = travel_tips;
...@@ -413,7 +413,7 @@ class InstitutionService extends Service { ...@@ -413,7 +413,7 @@ class InstitutionService extends Service {
ctx.failed(error); ctx.failed(error);
}); });
const ret = []; let ret = [];
for (let i in institutions) { for (let i in institutions) {
const institution = institutions[i]; const institution = institutions[i];
// const course_areas = institution.course_areas; // const course_areas = institution.course_areas;
...@@ -448,9 +448,11 @@ class InstitutionService extends Service { ...@@ -448,9 +448,11 @@ class InstitutionService extends Service {
area_id: institution.area_id,//校区id TODO area_id: institution.area_id,//校区id TODO
travel_tips: institution.travel_tips, //TODO travel_tips: institution.travel_tips, //TODO
characteristic: institution.characteristic ? institution.characteristic : '', characteristic: institution.characteristic ? institution.characteristic : '',
distance: institution.distance,
}); });
} }
ret = _.orderBy(ret, ['distance'], ['asc']);
return ret; return ret;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment