course fix

app/controller/course/institution.js

@@ -22,7 +22,9 @@ class InstitutionController extends Controller {
     async institutionInfo() {
 
         const { ctx } = this;
-        const input_params = ctx.params;
+        let input_params = ctx.params;
+        const query = ctx.query;
+        input_params = Object.assign(input_params, query);
         const result = await ctx.service.course.institution.getInstitution(input_params);
 
         ctx.success({ result });

app/service/course/institution.js

@@ -59,14 +59,45 @@ class InstitutionService extends Service {
     /**
      * 机构详情页
      */
-    async getInstitution({ institution_id, area_id }) {
+    async getInstitution(input) {
 
         const { ctx } = this;
-
+        const user_uuid = ctx.userUuid;
+        const { institution_id, area_id, lat, lng } = input;
         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 = await this.getInstitutionAreas({ institution_id, limit: 1000 });//校区
+        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 = [];
+        for (let i in area_rows) {
+
+            const area = area_rows[i];
+            const lbs = area_lbs[i];
+            const area_name = area.name;
+            const distance = lbs.distance ? lbs.distance : 10;
+            const duration = lbs.duration ? lbs.duration : 60;
+
+            let travel_tips = `距我${distance}km,开车${duration}分钟`;
+            if (lbs.travel_method === 'walking') {
+                travel_tips = `距我${distance}km,步行${duration}分钟`;
+            }
+
+            areas.push({
+                id: area.id,
+                institution_id: area.institution_id,
+                name: area_name,
+                address: area.address,
+                phone: area.phone,
+                travel_tips,
+                lat: area.lat,
+                lng: area.lng,
+            });
+        }
+
         const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });//图片
 
         //处理详情页信息
@@ -76,6 +107,14 @@ class InstitutionService extends Service {
         institution_detail.address = current_area.address;
         institution_detail.phone = current_area.phone;
         institution_detail.description = institution.description;
+        institution_detail.is_collect = false;
+
+        //是否收藏过
+        const collection_ret = await ctx.classModel.CourseUserCollection.one({ where: { user_uuid, institution_id, is_deleted: 0 } });
+        if (collection_ret && collection_ret.id) {
+            institution_detail.is_collect = true;
+        }
+
 
         //处理图片
         const photo_album = [];
@@ -89,7 +128,7 @@ class InstitutionService extends Service {
         }
         institution_detail.photo_album = photo_album;
 
-        return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas: areas.rows };
+        return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas: areas };
     }
 
     async getTeacher(teacher_id) {