Wesmiler 校企小程序 更新 6.22

app/store/service/Home.php

@@ -62,10 +62,13 @@ class Home extends BaseService
         // 最近七天日期
         $lately7days = $this->getLately7days();
 
-        // 前十名
-        $ranks = [];
-        for ($i=1; $i <= 10; $i++){
-            $ranks[] = "第{$i}名";
+        $type = $this->request->param('type', 1);
+        if($type == 1){
+            $ranks = $this->getSchoolViewsRank(10);
+        }else if($type == 2){
+            $ranks = $this->getSpecialityViewsRank(10);
+        } else if($type == 3){
+            $ranks = $this->getSchoolViewsRank(10);
         }
 
         $data = [
@@ -122,13 +125,7 @@ class Home extends BaseService
                 'orderTotalPrice' => $this->getOrderTotalPriceByDate($lately7days)
             ],
             // 排名统计
-            'ranks' => [
-                // 前十名
-                'rankNames' => $ranks,
-                'school' => $this->getSchoolViewsRank(10),
-                'speciality' => $this->getSpecialityViewsRank(10),
-                'teacher' => $this->getOrderTotalByDate($lately7days),
-            ]
+            'ranks' => $ranks,
         ];
         return $data;
     }
@@ -153,11 +150,15 @@ class Home extends BaseService
      */
     private function getSchoolViewsRank($limit=10)
     {
-        $ranks = $this->getRankData($limit);
+        $datas = [
+            'names'=> $this->getRankData($limit),
+            'series'=> $this->getRankData($limit)
+        ];
         $list = School::where(['audit_status'=> 1])->field('school_name, views')->order('views desc, id desc')->limit(10)->select();
         if($list){
             foreach ($list as $k => $item) {
-                $ranks[$k] = [
+                $datas['ranks'][$k] = $item['school_name'];
+                $datas['series'][$k] = [
                     'title'=> $item['school_name']." ({$item['views']})浏览",
                     'value'=> $item['views'],
                     'name'=> $item['school_name'],
@@ -165,7 +166,7 @@ class Home extends BaseService
             }
         }
 
-        return $ranks;
+        return $datas;
     }
 
     /**
@@ -175,19 +176,23 @@ class Home extends BaseService
      */
     private function getSpecialityViewsRank($limit=10)
     {
-        $ranks = $this->getRankData($limit);
+        $datas = [
+            'names'=> $this->getRankData($limit),
+            'datas'=> $this->getRankData($limit)
+        ];
         $list = SchoolSpeciality::where(['status'=> 1])->field('speciality_name, views')->order('views desc, speciality_id desc')->limit(10)->select();
         if($list){
             foreach ($list as $k => $item) {
-                $ranks[$k] = [
-                        'title'=> $item['speciality_name']." ({$item['views']})浏览",
-                        'value'=> $item['views'],
-                        'name'=> $item['speciality_name']
-                    ];
+                $datas['ranks'][$k] = $item['speciality_name'];
+                $datas['series'][$k] = [
+                    'title'=> $item['speciality_name']." ({$item['views']})浏览",
+                    'value'=> $item['views'],
+                    'name'=> $item['speciality_name'],
+                ];
             }
         }
 
-        return $ranks;
+        return $datas;
     }
 
     /**