fix

app/service/course/institution.js

@@ -67,9 +67,22 @@ class InstitutionService extends Service {
         const institution = await ctx.classModel.CourseInstitution.one({ where: { id: institution_id } });
         const teachers = await this.getTeachers({ institution_id, limit: 6 });
         const classes = await this.getClasses({ institution_id, limit: 4 });
-        const areas_ret = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
+
+        const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });//图片
+
+        //处理详情页信息
+        const current_area = await ctx.classModel.CourseArea.one({ id: area_id });
+        let institution_detail = await this.formatInstitutions([institution]);
+        institution_detail = institution_detail[0];
+        institution_detail.address = current_area.address;
+        institution_detail.phone = current_area.phone;
+        institution_detail.description = institution.description;
+        institution_detail.point = institution.point;
+        institution_detail.honor = institution.honor;
+        institution_detail.is_collect = 0;
 
         //计算校区距离
+        const areas_ret = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
         const area_rows = areas_ret.rows;
         const area_lbs = await this.computeDistance(area_rows, { lat, lng });//计算距离信息
         const areas = [];
@@ -88,6 +101,9 @@ class InstitutionService extends Service {
             if (distance === 0 && duration === 0) {
                 travel_tips = '暂无法计算出距离';
             }
+            if (area.id == area_id && area.institution_id == institution_id) {
+                institution_detail.travel_tips = travel_tips;
+            }
             areas.push({
                 id: area.id,
                 institution_id: area.institution_id,
@@ -100,19 +116,6 @@ class InstitutionService extends Service {
             });
         }
 
-        const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });//图片
-
-        //处理详情页信息
-        const current_area = await ctx.classModel.CourseArea.one({ id: area_id });
-        let institution_detail = await this.formatInstitutions([institution]);
-        institution_detail = institution_detail[0];
-        institution_detail.address = current_area.address;
-        institution_detail.phone = current_area.phone;
-        institution_detail.description = institution.description;
-        institution_detail.point = institution.point;
-        institution_detail.honor = institution.honor;
-        institution_detail.is_collect = 0;
-
         //是否收藏过
         const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } });
         if (collection_ret && collection_ret.id) {