change course institution list

app/service/course/institution.js

@@ -51,7 +51,8 @@ class InstitutionService extends Service {
     const institution_area_list = await this.getInstitutionAreaList(institutions);// 将校区表处理成数组
     // const from = { lat, lng };
     // const area_lbs = await this.computeDistance(institution_area_list, { lat, lng });// 计算距离信息
-    const area_distance = await this.calcDistance(institution_area_list, { lat, lng }, page);
+    const area_distance_list = await this.calcDistance(institution_area_list, { lat, lng }, page);
+    const area_distance = area_distance_list.rows;
     const institution_areas = await this.computeDistance(area_distance, { lat, lng });
     for (const i in institution_areas) {
       area_distance[i].distance = Number(institution_areas[i].distance) === 0 ? 999999999.0 : parseFloat(institution_areas[i].distance);
@@ -69,7 +70,7 @@ class InstitutionService extends Service {
     // const ret = await this.formatInstitutions(institution_areas);
     const ret = await this.formatInstitutions(area_distance);
 
-    return ret;
+    return { count: area_distance_list.count, rows: ret };
   }
 
   /**
@@ -405,7 +406,7 @@ class InstitutionService extends Service {
     const { ctx } = this;
 
     if (!Array.isArray(lbs_array) || lbs_array.length === 0) {
-      return [];
+      return { count: 0, rows: [] };
     }
 
     const calcHandle = [];
@@ -445,10 +446,13 @@ class InstitutionService extends Service {
     }
 
     if (results.length <= (page - 1) * 10) {
-      return [];
+      return { count: 0, rows: [] };
     }
     const end = page * 10 > results.length ? results.length : page * 10;
-    return R.slice((page - 1) * 10, end)(results);
+    return {
+      count: results.length,
+      rows: R.slice((page - 1) * 10, end)(results),
+    };
   }
 
   /**