fix class image

app/service/course/institution.js

@@ -8,20 +8,20 @@ const moment = require('moment');
 class InstitutionService extends Service {
 
 
-    //机构列表页
+  // 机构列表页
   async getInstitutions(input) {
 
     const { ctx } = this;
     const user_uuid = ctx.userUuid;
     const { cats, ages, lat, lng, address } = input;
     const where_institutions = input.institutions;
-        //保存定位记录
+    // 保存定位记录
     if (address && lat && lng) {
       ctx.classModel.CourseLogUserGps.add({ user_uuid, address, lat, lng });
     }
 
-        //处理条件过滤条件
-        let where = { status: 1, is_deleted: 0 };
+    // 处理条件过滤条件
+    const where = { status: 1, is_deleted: 0 };
     if (Number(cats)) {
       const cat_ret = await ctx.classModel.CourseCat.one({ where: { id: cats } });
       const cat_id = cat_ret.id;
@@ -30,7 +30,7 @@ class InstitutionService extends Service {
       const next_next_level = cat_level + 2;
       const next_cat = await ctx.classModel.CourseCat.all({ where: { level: next_level, parent_id: cat_id } });
       const next_next_cat = await ctx.classModel.CourseCat.all({ where: { level: next_next_level, first_id: cat_id } });
-            let cat_ids = [cat_id,];
+      let cat_ids = [ cat_id  ];
       cat_ids = cat_ids.concat(R.pluck('id', next_cat)).concat(R.pluck('id', next_next_cat));
       const institutions = await ctx.classModel.CourseInstitutionToCat.all({ where: { cat_id: { $in: cat_ids } } });
       where.id = { $in: R.pluck('institution_id', institutions) };
@@ -43,15 +43,15 @@ class InstitutionService extends Service {
       where.corner = { $ne: '' };
     }
 
-        //关联校区表查找信息
-        const include = [{ model: ctx.classModel.CourseArea, where: { status: 1, is_deleted: 0 }, attributes: ['id', 'institution_id', 'name', 'address', 'lat', 'lng'] }];
-        const attributes = ['id', 'name', 'type', 'establishment_time', 'class_type', 'teacher_count', 'teacher_experience', 'corner', 'min_age', 'max_age', 'price', 'characteristic',];
+    // 关联校区表查找信息
+    const include = [{ model: ctx.classModel.CourseArea, where: { status: 1, is_deleted: 0 }, attributes: [ 'id', 'institution_id', 'name', 'address', 'lat', 'lng' ] }];
+    const attributes = [ 'id', 'name', 'type', 'establishment_time', 'class_type', 'teacher_count', 'teacher_experience', 'corner', 'min_age', 'max_age', 'price', 'characteristic'  ];
     const institutions = await ctx.classModel.CourseInstitution.findAll({ attributes, include, where });
 
-        const institution_area_list = await this.getInstitutionAreaList(institutions);//将校区表处理成数组
+    const institution_area_list = await this.getInstitutionAreaList(institutions);// 将校区表处理成数组
     // const from = { lat, lng };
-        const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });//计算距离信息
-        const institution_areas = await this.findShortestDistanceAreas(institution_area_list, area_lbs);//查找最短距离并输出
+    const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息
+    const institution_areas = await this.findShortestDistanceAreas(institution_area_list, area_lbs);// 查找最短距离并输出
     const ret = await this.formatInstitutions(institution_areas);
 
     return ret;
@@ -71,11 +71,11 @@ class InstitutionService extends Service {
     const teachers = await this.getTeachers({ institution_id, limit: 6 });
     const classes = await this.getClasses({ institution_id, limit: 4 });
 
-        const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });//图片
+    const institution_images = await ctx.classModel.CourseImages.all({ where: { type: 1, type_id: institution_id } });// 图片
 
-        //处理详情页信息
-        const current_area = await ctx.classModel.CourseArea.one({ where:{id: area_id }});
-        let institution_detail = await this.formatInstitutions([institution]);
+    // 处理详情页信息
+    const current_area = await ctx.classModel.CourseArea.one({ where: { 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;
@@ -84,13 +84,13 @@ class InstitutionService extends Service {
     institution_detail.honor = institution.honor;
     institution_detail.is_collect = 0;
 
-        //计算校区距离
-        const areas_ret = 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 = (lat > 0 || lng > 0) ? await this.computeDistance(area_rows, { lat, lng }) : [];//计算距离信息
+    const area_lbs = (lat > 0 || lng > 0) ? await this.computeDistance(area_rows, { lat, lng }) : [];// 计算距离信息
     let areas = [];
 
-        for (let i in area_rows) {
+    for (const i in area_rows) {
 
       const area = area_rows[i];
       const lbs = i < area_lbs.length ? area_lbs[i] : { distance: 0, duration: 0, travel_method: '' };
@@ -122,19 +122,19 @@ class InstitutionService extends Service {
         distance: Number(distance) === 0 ? 999999999.0 : parseFloat(distance),
       });
     }
-        areas = _.orderBy(areas, ['distance'], ['asc']);
+    areas = _.orderBy(areas, [ 'distance' ], [ 'asc' ]);
 
-        //是否收藏过
+    // 是否收藏过
     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 = 1;
     }
 
 
-        //处理图片
+    // 处理图片
     const photo_album = [];
-        let photo_check = []; // 去重
-        for (let i in institution_images) {
+    const photo_check = []; // 去重
+    for (const i in institution_images) {
       const institution_image = institution_images[i];
       if (institution_image.is_video > 0) {
         if (photo_check.includes(institution_image.video_url)) {
@@ -157,14 +157,14 @@ class InstitutionService extends Service {
     }
     institution_detail.photo_album = photo_album;
 
-        return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas: areas };
+    return { institution_detail, teachers: teachers.rows, classes: classes.rows, areas };
   }
 
   async getTeacher(teacher_id) {
 
     const { ctx } = this;
     const where = { id: teacher_id };
-        let teacher = await ctx.classModel.CourseTeacher.one({ where });
+    const teacher = await ctx.classModel.CourseTeacher.one({ where });
     teacher.dataValues.point_tags = teacher.point ? teacher.point.split(',') : [];
     teacher.dataValues.work_experience_tags = teacher.work_experience ? teacher.work_experience.split(';') : [];
 
@@ -178,7 +178,7 @@ class InstitutionService extends Service {
 
     const { ctx } = this;
     const where = { id: class_id };
-        let classs = await ctx.classModel.CourseClass.one({ where });
+    const classs = await ctx.classModel.CourseClass.one({ where });
     classs.dataValues.age_text = Number(classs.max_age) > 0 ? `${classs.min_age}-${classs.max_age}岁` : '';
     classs.dataValues.point_tags = classs.point ? classs.point.split(',') : [];
     classs.dataValues.photo_album = classs.image ? classs.image.split(';') : [];
@@ -190,13 +190,13 @@ class InstitutionService extends Service {
   async getTeachers(input) {
 
     const { ctx } = this;
-        const attributes = ['id', 'institution_id', 'name', 'avatar', 'teacher_experience', 'lesson', 'educational_background', 'certificate'];
+    const attributes = [ 'id', 'institution_id', 'name', 'avatar', 'teacher_experience', 'lesson', 'educational_background', 'certificate' ];
     const { institution_id, page, limit } = input;
     const where = { institution_id };
     const teachers = await ctx.classModel.CourseTeacher.list({ attributes, page, limit, where });
 
     const ret = [];
-        for (let i in teachers.rows) {
+    for (const i in teachers.rows) {
       const teacher = teachers.rows[i];
       ret.push({
         id: teacher.id,
@@ -210,35 +210,35 @@ class InstitutionService extends Service {
       });
     }
 
-        return {page, count:ret.length, rows:ret};
+    return { page, count: ret.length, rows: ret };
 
   }
 
   async getClasses(input) {
 
     const { ctx } = this;
-        const attributes = ['id', 'institution_id', 'name', 'type', 'price'];
+    const attributes = [ 'id', 'institution_id', 'name', 'type', 'price' ];
     const { institution_id, page, limit } = input;
     const where = { institution_id };
     const classes = await ctx.classModel.CourseClass.list({ attributes, page, limit, where });
     const p_class_images = [];
 
-        //获取图片信息
-        for (let j in classes.rows) {
+    // 获取图片信息
+    for (const j in classes.rows) {
       const classs = classes.rows[j];
-            p_class_images[j] = ctx.classModel.CourseImages.one({ where: { type: 2, type_id: classs.id, is_cover: 1, is_video: 0 } });
+      p_class_images[j] = ctx.classModel.CourseImages.one({ where: { type: 2, type_id: classs.id, is_video: 0 } });
     }
-        const class_images = await Promise.all(p_class_images).then(result => {//等待所有异步内容获取完成
+    const class_images = await Promise.all(p_class_images).then(result => { // 等待所有异步内容获取完成
       return result;
     }).catch(error => {
       ctx.failed(error);
     });
 
-        //格式化课程信息
-        let ret = [];
-        for (let i in classes.rows) {
-            let classs = classes.rows[i];
-            classs.dataValues.image = class_images[i] ? class_images[i].image_url : '';;
+    // 格式化课程信息
+    const ret = [];
+    for (const i in classes.rows) {
+      const classs = classes.rows[i];
+      classs.dataValues.image = class_images[i] ? class_images[i].image_url : '';
             classs.dataValues.price_text = classs.price ? classs.price : '现场咨询';
       classs.dataValues.class_period = classs.class_period > 0 ? classs.class_period : '';
       ret.push(classs);
@@ -251,7 +251,7 @@ class InstitutionService extends Service {
   async getInstitutionAreas(input) {
 
     const { ctx } = this;
-        const attributes = ['id', 'institution_id', 'name', 'address', 'phone', 'lat', 'lng'];
+    const attributes = [ 'id', 'institution_id', 'name', 'address', 'phone', 'lat', 'lng' ];
     const { institution_id, page, limit } = input;
     const where = { institution_id };
     const areas = await ctx.classModel.CourseArea.list({ attributes, page, limit, where });
@@ -260,7 +260,7 @@ class InstitutionService extends Service {
 
   }
 
-    //机构列表 并有多校区 {id：1，..., course_areas:[{},{}]
+  // 机构列表 并有多校区 {id：1，..., course_areas:[{},{}]
   async getInstitutionAreaList(institutions) {
 
     const { ctx } = this;
@@ -270,11 +270,11 @@ class InstitutionService extends Service {
     }
 
     const ret = [];
-        for (let i in institutions) {
-            let institution = institutions[i];
+    for (const i in institutions) {
+      const institution = institutions[i];
       if (!institution.course_areas || institution.course_areas.length === 0) continue;
       const course_areas = institution.course_areas;
-            for (let j in course_areas) {
+      for (const j in course_areas) {
         const course_area = course_areas[j];
         ret.push({
           id: institution.id,
@@ -320,29 +320,29 @@ class InstitutionService extends Service {
     const lat = from.lat;
     const lng = from.lng;
     // console.info({ lat, lng });
-        //计算距离
+    // 计算距离
     const driving_results = await ctx.service.course.lbs.getLBSDistance('driving', { lat, lng }, lbs_array);
     const walking_results = await ctx.service.course.lbs.getLBSDistance('walking', { lat, lng }, lbs_array);
     if (!walking_results.results && !driving_results.results) {
       return [];
     }
 
-        //处理距离结果
+    // 处理距离结果
     const drivings = driving_results.results.map(item => {
       const distance = (item.distance / 1000).toFixed(1);
       const duration = Math.ceil(item.duration / 60);
-            return { distance: distance, duration: duration }
+      return { distance, duration };
     });
     const walkings = walking_results.results.map(item => {
       const distance = (item.distance / 1000).toFixed(2);
       const duration = Math.ceil(item.distance / 80);
-            return { distance: distance, duration: duration }
+      return { distance, duration };
     });
 
-        //格式化 判断步行或驾车
+    // 格式化 判断步行或驾车
     const results = [];
-        for (let i in lbs_array) {
-            let lbs = lbs_array[i];
+    for (const i in lbs_array) {
+      const lbs = lbs_array[i];
       const driving = (drivings[i] && drivings[i].distance !== -1) ? drivings[i] : { distance: 0, duration: 0 };
       const walking = (walkings[i] && walkings[i].distance !== -1) ? walkings[i] : { distance: 0, duration: 0 };
       const lbs_distance = driving.distance > distance ? driving : walking;
@@ -373,10 +373,10 @@ class InstitutionService extends Service {
     // const institution_lbs = await this.computeDistance(areas_list);
 
     const institution_lbs = areas_list;
-        for (let i in institution_areas) {
+    for (const i in institution_areas) {
 
-            let institution_area = institution_areas[i];
-            //TODO 校验经纬度
+      const institution_area = institution_areas[i];
+      // TODO 校验经纬度
       const lbs = i < institution_lbs.length ? institution_lbs[i] : { distance: 0, duration: 0, travel_method: '' };
 
       const area_name = institution_area.area_name;
@@ -401,8 +401,8 @@ class InstitutionService extends Service {
     }
 
     const results = [];
-        ret = _.orderBy(ret, ['distance'], ['asc']);
-        for (let j in ret) {
+    ret = _.orderBy(ret, [ 'distance' ], [ 'asc' ]);
+    for (const j in ret) {
       const val = ret[j];
       if (!results[val.id]) {
         results[val.id] = val;
@@ -419,20 +419,20 @@ class InstitutionService extends Service {
       return [];
     }
 
-        //处理机构图片
+    // 处理机构图片
     const p_institution_images = [];
-        for (let j in institutions) {
+    for (const j in institutions) {
       const institution = institutions[j];
       p_institution_images[j] = ctx.classModel.CourseImages.one({ where: { type: 1, type_id: institution.id, is_cover: 1, is_video: 0 } });
     }
-        const institution_images = await Promise.all(p_institution_images).then(result => {//等待所有异步内容获取完成
+    const institution_images = await Promise.all(p_institution_images).then(result => { // 等待所有异步内容获取完成
       return result;
     }).catch(error => {
       ctx.failed(error);
     });
 
     let ret = [];
-        for (let i in institutions) {
+    for (const i in institutions) {
       const institution = institutions[i];
       // const course_areas = institution.course_areas;
       // if (!course_areas || course_areas.length === 0) continue;
@@ -449,7 +449,7 @@ class InstitutionService extends Service {
         tags.push('成立' + build_time + '年');
       }
       let image = institution_images[i] ? institution_images[i].image_url : '';
-            //取不到封面图就从详情图列表里选一张
+      // 取不到封面图就从详情图列表里选一张
       if (ctx.isEmpty(image)) {
         const tmpImage = await ctx.classModel.CourseImages.one({ where: { type: 1, type_id: institution.id, is_cover: 0, is_video: 0 } });
         image = ctx.isEmpty(tmpImage) ? '' : tmpImage.image_url;
@@ -468,23 +468,18 @@ class InstitutionService extends Service {
         max_age: institution.max_age,
         price: institution.price ? institution.price : 0,
         tags,
-                area_id: institution.area_id,//校区id TODO
-                travel_tips: institution.travel_tips, //TODO
+        area_id: institution.area_id, // 校区id TODO
+        travel_tips: institution.travel_tips, // TODO
         characteristic: institution.characteristic ? institution.characteristic : '',
         distance: institution.distance,
       });
     }
 
-        ret = _.orderBy(ret, ['distance'], ['asc']);
+    ret = _.orderBy(ret, [ 'distance' ], [ 'asc' ]);
     return ret;
   }
 
 
-
-
-
-
-
 }
 
 module.exports = InstitutionService;

app/service/course/option.js

@@ -39,7 +39,7 @@ class OptionService extends Service {
       cats: tree_cats,
       ages: AGE_CATS,
       institutions: INSTITUTION_TYPE,
-        }
+    };
     return options;
   }