Commit 65a136cd authored by 任国军's avatar 任国军

fix areas order

parent 2fbb1047
Pipeline #14437 passed with stage
in 8 seconds
......@@ -88,7 +88,7 @@ class InstitutionService extends Service {
const areas_ret = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
const area_rows = areas_ret.rows;
const area_lbs = (lat > 0 || lng > 0) ? await this.computeDistance(area_rows, { lat, lng }) : [];//计算距离信息
const areas = [];
let areas = [];
for (let i in area_rows) {
......@@ -102,7 +102,7 @@ class InstitutionService extends Service {
if (lbs.travel_method === 'walking') {
travel_tips = `距我${distance}km,步行${duration}分钟`;
}
if (distance === 0 && duration === 0) {
if (Number(distance) === 0 && duration === 0) {
travel_tips = '暂无法计算出距离';
}
if (area.id == area_id && area.institution_id == institution_id) {
......@@ -119,8 +119,10 @@ class InstitutionService extends Service {
travel_tips,
lat: area.lat,
lng: area.lng,
distance: Number(distance) === 0 ? 999999999.0 : parseFloat(distance),
});
}
areas = _.orderBy(areas, ['distance'], ['asc']);
//是否收藏过
const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } });
......@@ -237,7 +239,7 @@ class InstitutionService extends Service {
const { institution_id, page, limit } = input;
const where = { institution_id };
const areas = await ctx.classModel.CourseArea.list({ attributes, page, limit, where });
return areas;
}
......
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